Merge branch 'pre4-testing' into 4zk-content-source

Author: fourZK

Entities/AHuman.cpp

@@ -4308,9 +4308,8 @@ void AHuman::DrawHUD(BITMAP *pTargetBitmap, const Vector &targetPos, int whichSc
 		}
         // Held-related GUI stuff
         else if (m_pFGArm || m_pBGArm) {
-            HDFirearm *fgHeldFirearm = dynamic_cast<HDFirearm *>(m_pFGArm->GetHeldDevice());
-			MovableObject *bgHeldItem = GetEquippedBGItem();
-			const HDFirearm *bgHeldFirearm = dynamic_cast<HDFirearm *>(bgHeldItem);
+            HDFirearm *fgHeldFirearm = dynamic_cast<HDFirearm *>(GetEquippedItem());
+			HDFirearm *bgHeldFirearm = dynamic_cast<HDFirearm *>(GetEquippedBGItem());
 
             if (fgHeldFirearm || bgHeldFirearm) {
                 str[0] = -56; str[1] = 0;
@@ -4327,7 +4326,7 @@ void AHuman::DrawHUD(BITMAP *pTargetBitmap, const Vector &targetPos, int whichSc
 					}
 				}
 
-                if (bgHeldItem && bgHeldFirearm) {
+                if (bgHeldFirearm) {
 					std::string bgWeaponString;
 					if (bgHeldFirearm->IsReloading()) {
 						bgWeaponString = "Reloading";
@@ -4359,7 +4358,7 @@ void AHuman::DrawHUD(BITMAP *pTargetBitmap, const Vector &targetPos, int whichSc
                     m_HUDStack -= 11;
                 }
 */
-				std::string equippedItemsString = (m_pFGArm->HoldsSomething() ? m_pFGArm->GetHeldMO()->GetPresetName() : "EMPTY") + (m_pBGArm->HoldsSomething() ? " | " + m_pBGArm->GetHeldMO()->GetPresetName() : "");
+				std::string equippedItemsString = (m_pFGArm && m_pFGArm->HoldsSomething() ? m_pFGArm->GetHeldMO()->GetPresetName() : "EMPTY") + (m_pBGArm && m_pBGArm->HoldsSomething() ? " | " + m_pBGArm->GetHeldMO()->GetPresetName() : "");
 				pSmallFont->DrawAligned(&allegroBitmap, drawPos.GetFloorIntX() + 1, drawPos.GetFloorIntY() + m_HUDStack + 3, equippedItemsString, GUIFont::Centre);
 				m_HUDStack -= 9;
 /*

Entities/AtomGroup.cpp

@@ -235,7 +235,10 @@ namespace RTE {
 			m_Atoms.push_back(atomToAdd);
 			m_SubGroups.at(subgroupID).push_back(atomToAdd);
 		}
-		if (!atomList.empty()) { m_MomentOfInertia = 0.0F; }
+		if (!atomList.empty()) {
+			m_MomentOfInertia = 0.0F;
+			if (m_OwnerMOSR) { GetMomentOfInertia(); }
+		}
 	}
 
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -257,7 +260,10 @@ namespace RTE {
 			}
 		}
 		m_SubGroups.erase(removeID);
-		if (removedAny) { m_MomentOfInertia = 0.0F; }
+		if (removedAny) {
+			m_MomentOfInertia = 0.0F;
+			if (m_OwnerMOSR) { GetMomentOfInertia(); }
+		}
 
 		return removedAny;
 	}

Entities/Attachable.cpp

@@ -216,11 +216,12 @@ namespace RTE {
 		}
 		totalImpulseForce *= jointStiffnessValueToUse;
 
-		if (gibImpulseLimitValueToUse > 0 && totalImpulseForce.GetMagnitude() > gibImpulseLimitValueToUse) {
+		float totalImpulseForceMagnitude = totalImpulseForce.GetMagnitude();
+		if (gibImpulseLimitValueToUse > 0 && totalImpulseForceMagnitude > gibImpulseLimitValueToUse) {
 			jointImpulses += totalImpulseForce.SetMagnitude(gibImpulseLimitValueToUse);
 			GibThis();
 			return false;
-		} else if (jointStrengthValueToUse > 0 && totalImpulseForce.GetMagnitude() > jointStrengthValueToUse) {
+		} else if (jointStrengthValueToUse > 0 && totalImpulseForceMagnitude > jointStrengthValueToUse) {
 			jointImpulses += totalImpulseForce.SetMagnitude(jointStrengthValueToUse);
 			m_Parent->RemoveAttachable(this, true, true);
 			return false;