xrGame/CustomOutfit.h|cpp: make Get* functions as const and nodiscard

Same change for ActorHelmet.h|cpp

Author: Xottab-DUTY

src/xrGame/ActorHelmet.cpp

@@ -130,19 +130,23 @@ void CHelmet::Hit(float hit_power, ALife::EHitType hit_type)
     ChangeCondition(-hit_power);
 }
 
-float CHelmet::GetDefHitTypeProtection(ALife::EHitType hit_type)
+float CHelmet::GetDefHitTypeProtection(ALife::EHitType hit_type) const
 {
     return m_HitTypeProtection[hit_type] * GetCondition();
 }
 
-float CHelmet::GetHitTypeProtection(ALife::EHitType hit_type, s16 element)
+float CHelmet::GetHitTypeProtection(ALife::EHitType hit_type, s16 element) const
 {
-    float fBase = m_HitTypeProtection[hit_type] * GetCondition();
-    float bone = m_boneProtection->getBoneProtection(element);
-    return fBase * bone;
+    const float base = m_HitTypeProtection[hit_type] * GetCondition();
+    const float bone = m_boneProtection->getBoneProtection(element);
+    return base * bone;
+}
+
+float CHelmet::GetBoneArmor(s16 element) const
+{
+    return m_boneProtection->getBoneArmor(element);
 }
 
-float CHelmet::GetBoneArmor(s16 element) { return m_boneProtection->getBoneArmor(element); }
 bool CHelmet::install_upgrade_impl(LPCSTR section, bool test)
 {
     bool result = inherited::install_upgrade_impl(section, test);

src/xrGame/ActorHelmet.h

@@ -27,9 +27,9 @@ class CHelmet : public CInventoryItemObject
     virtual void net_Import(NET_Packet& P);
     virtual void OnH_A_Chield();
 
-    float GetDefHitTypeProtection(ALife::EHitType hit_type);
-    float GetHitTypeProtection(ALife::EHitType hit_type, s16 element);
-    float GetBoneArmor(s16 element);
+    [[nodiscard]] float GetDefHitTypeProtection(ALife::EHitType hit_type) const;
+    [[nodiscard]] float GetHitTypeProtection(ALife::EHitType hit_type, s16 element) const;
+    [[nodiscard]] float GetBoneArmor(s16 element) const;
 
     float HitThroughArmor(float hit_power, s16 element, float ap, bool& add_wound, ALife::EHitType hit_type);
 
@@ -46,7 +46,7 @@ class CHelmet : public CInventoryItemObject
     void AddBonesProtection(LPCSTR bones_section);
 
 protected:
-    HitImmunity::HitTypeSVec m_HitTypeProtection;
+    mutable HitImmunity::HitTypeSVec m_HitTypeProtection;
     SBoneProtections* m_boneProtection;
 
 protected:

src/xrGame/CustomOutfit.cpp

@@ -122,19 +122,23 @@ void CCustomOutfit::Hit(float hit_power, ALife::EHitType hit_type)
     ChangeCondition(-hit_power);
 }
 
-float CCustomOutfit::GetDefHitTypeProtection(ALife::EHitType hit_type)
+float CCustomOutfit::GetDefHitTypeProtection(ALife::EHitType hit_type) const
 {
     return m_HitTypeProtection[hit_type] * GetCondition();
 }
 
-float CCustomOutfit::GetHitTypeProtection(ALife::EHitType hit_type, s16 element)
+float CCustomOutfit::GetHitTypeProtection(ALife::EHitType hit_type, s16 element) const
 {
     float fBase = m_HitTypeProtection[hit_type] * GetCondition();
     float bone = m_boneProtection->getBoneProtection(element);
     return fBase * bone;
 }
 
-float CCustomOutfit::GetBoneArmor(s16 element) { return m_boneProtection->getBoneArmor(element); }
+float CCustomOutfit::GetBoneArmor(s16 element) const
+{
+    return m_boneProtection->getBoneArmor(element);
+}
+
 float CCustomOutfit::HitThroughArmor(float hit_power, s16 element, float ap, bool& add_wound, ALife::EHitType hit_type)
 {
     float NewHitPower = hit_power;
@@ -276,7 +280,11 @@ void CCustomOutfit::OnMoveToRuck(const SInvItemPlace& prev)
     }
 };
 
-u32 CCustomOutfit::ef_equipment_type() const { return (m_ef_equipment_type); }
+u32 CCustomOutfit::ef_equipment_type() const
+{
+    return m_ef_equipment_type;
+}
+
 bool CCustomOutfit::install_upgrade_impl(LPCSTR section, bool test)
 {
     bool result = inherited::install_upgrade_impl(section, test);

src/xrGame/CustomOutfit.h

@@ -21,9 +21,9 @@ class CCustomOutfit : public CInventoryItemObject
     //коэффициенты на которые домножается хит
     //при соответствующем типе воздействия
     //если на персонаже надет костюм
-    float GetHitTypeProtection(ALife::EHitType hit_type, s16 element);
-    float GetDefHitTypeProtection(ALife::EHitType hit_type);
-    float GetBoneArmor(s16 element);
+    [[nodiscard]] float GetHitTypeProtection(ALife::EHitType hit_type, s16 element) const;
+    [[nodiscard]] float GetDefHitTypeProtection(ALife::EHitType hit_type) const;
+    [[nodiscard]] float GetBoneArmor(s16 element) const;
 
     float HitThroughArmor(float hit_power, s16 element, float ap, bool& add_wound, ALife::EHitType hit_type);
 
@@ -32,7 +32,7 @@ class CCustomOutfit : public CInventoryItemObject
     virtual void OnH_A_Chield();
 
 protected:
-    HitImmunity::HitTypeSVec m_HitTypeProtection;
+    mutable HitImmunity::HitTypeSVec m_HitTypeProtection;
 
     shared_str m_ActorVisual;
     shared_str m_full_icon_name;