Made EstimateDigStrength const all the way down, and made it work better for hdfirearms with no current magazine

Author: garethyr

Entities/AHuman.cpp

@@ -1163,38 +1163,30 @@ bool AHuman::EquipDiggingTool(bool doEquip)
     return false;
 }
 
-
-//////////////////////////////////////////////////////////////////////////////////////////
-// Method:          EstimateDigStrength
 //////////////////////////////////////////////////////////////////////////////////////////
-// Description:     Estimates what material strength this actor can move through.
 
-float AHuman::EstimateDigStrength()
-{
+float AHuman::EstimateDigStrength() const {
     float maxPenetration = Actor::EstimateDigStrength();
 
 	if (!(m_pFGArm && m_pFGArm->IsAttached())) {
 		return maxPenetration;
 	}
 
-    if (HDFirearm *heldDeviceAsHDFirearm = dynamic_cast<HDFirearm *>(m_pFGArm->GetHeldDevice()); heldDeviceAsHDFirearm && heldDeviceAsHDFirearm->IsInGroup("Tools - Diggers")) {
+    if (const HDFirearm *heldDeviceAsHDFirearm = dynamic_cast<HDFirearm *>(m_pFGArm->GetHeldDevice()); heldDeviceAsHDFirearm && heldDeviceAsHDFirearm->IsInGroup("Tools - Diggers")) {
 		maxPenetration = std::max(heldDeviceAsHDFirearm->EstimateDigStrength(), maxPenetration);
     }
 
-    // Go through the inventory looking for the proper device
-    for (std::deque<MovableObject *>::iterator itr = m_Inventory.begin(); itr != m_Inventory.end(); ++itr)
-    {
-        HDFirearm *pTool = dynamic_cast<HDFirearm *>(*itr);
-        // Found proper device to equip, so make the switch!
-        if (pTool && pTool->IsInGroup("Tools - Diggers"))
-        {
-            maxPenetration = std::max(pTool->EstimateDigStrength(), maxPenetration);
+	for (const MovableObject *inventoryItem : m_Inventory) {
+        if (const HDFirearm *inventoryItemAsFirearm = dynamic_cast<const HDFirearm *>(inventoryItem); inventoryItemAsFirearm && inventoryItemAsFirearm->IsInGroup("Tools - Diggers")) {
+            maxPenetration = std::max(inventoryItemAsFirearm->EstimateDigStrength(), maxPenetration);
         }
     }
 
     return maxPenetration;
 }
 
+//////////////////////////////////////////////////////////////////////////////////////////
+
 
 //////////////////////////////////////////////////////////////////////////////////////////
 // Virtual Method:  EquipShield

Entities/AHuman.h

@@ -547,16 +547,11 @@ DefaultPieMenuNameGetter("Default Human Pie Menu");
 
 	bool EquipDiggingTool(bool doEquip = true);
 
-
-//////////////////////////////////////////////////////////////////////////////////////////
-// Method:          EstimateDigStrength
-//////////////////////////////////////////////////////////////////////////////////////////
-// Description:     Estimates what material strength any digger this actor is carrying
-//                  can penetrate.
-// Arguments:       None.
-// Return value:    A default dig strength (what the actor can be expected to just walk through without tools), or the maximum material strength this actor's digger can penetrate.
-
-    float EstimateDigStrength() override;
+    /// <summary>
+    /// Estimates what material strength any digger this AHuman is carrying can penetrate.
+    /// </summary>
+    /// <returns>The maximum material strength this AHuman's digger can penetrate, or a default dig strength if they don't have a digger.</returns>
+    float EstimateDigStrength() const override;
 
 
 //////////////////////////////////////////////////////////////////////////////////////////

Entities/Actor.cpp

@@ -1291,7 +1291,7 @@ bool Actor::UpdateMovePath()
 
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-float Actor::EstimateDigStrength() {
+float Actor::EstimateDigStrength() const {
     return m_AIBaseDigStrength;
 }
 

Entities/Actor.h

@@ -1127,7 +1127,7 @@ ClassInfoGetters;
     /// Estimates what material strength this actor can penetrate.
     /// </summary>
 	/// <returns>The actor's dig strength.</returns>
-    virtual float EstimateDigStrength();
+    virtual float EstimateDigStrength() const;
 
     /// <summary>
     /// Gets this Actor's base dig strength, or the strength of terrain they can expect to walk through without tools.

Entities/HDFirearm.cpp

@@ -1115,13 +1115,8 @@ void HDFirearm::Update()
 //////////////////////////////////////////////////////////////////////////////////////////
 // Description:     Estimates what material strength the rounds in the magazine can destroy. 
 
-float HDFirearm::EstimateDigStrength()
-{
-    if (m_pMagazine) {
-        return m_pMagazine->EstimateDigStrength();
-    }
-
-    return 1;
+float HDFirearm::EstimateDigStrength() const {
+	return m_pMagazine ? m_pMagazine->EstimateDigStrength() : m_pMagazineReference->EstimateDigStrength();
 }
 
 

Entities/HDFirearm.h

@@ -796,7 +796,7 @@ AddScriptFunctionNames(HeldDevice, "OnFire", "OnReload");
 // Arguments:       None.
 // Return value:    The maximum material strength the regular or the tracer round can destroy.
 
-    float EstimateDigStrength();
+    float EstimateDigStrength() const;
 
 
 //////////////////////////////////////////////////////////////////////////////////////////

Entities/Magazine.cpp

@@ -225,8 +225,7 @@ Round * Magazine::PopNextRound()
 //////////////////////////////////////////////////////////////////////////////////////////
 // Description:     Estimates what material strength the rounds in the magazine can destroy. 
 
-float Magazine::EstimateDigStrength()
-{
+float Magazine::EstimateDigStrength() const {
     float maxPenetration = 1;
     if (m_pTracerRound)
     {

Entities/Magazine.h

@@ -206,7 +206,7 @@ ClassInfoGetters;
 // Arguments:       None.
 // Return value:    The material strength.
 
-    float EstimateDigStrength();
+    float EstimateDigStrength() const;
 
 
 //////////////////////////////////////////////////////////////////////////////////////////