Review changes

Author: fourZK

Entities/AHuman.cpp

@@ -3582,20 +3582,20 @@ void AHuman::Update()
 			}
 			bool climbing = m_ArmClimbing[FGROUND] || m_ArmClimbing[BGROUND];
 
-            if (m_StrideSound) {
-                m_StrideSound->SetPosition(m_Pos);
-                if (m_StrideSound->GetLoopSetting() < 0) {
-                    if (!m_StrideSound->IsBeingPlayed()) { m_StrideSound->Play(); }
-                } else if (restarted && !climbing) {
-                    m_StrideSound->Play();
-                }
-            }
+			if (m_StrideSound) {
+				m_StrideSound->SetPosition(m_Pos);
+				if (m_StrideSound->GetLoopSetting() < 0) {
+					if (!m_StrideSound->IsBeingPlayed()) { m_StrideSound->Play(); }
+				} else if (restarted && !climbing) {
+					m_StrideSound->Play();
+				}
+			}
 			if (restarted) {
 				if (climbing) {
-                    m_WalkAngle[FGROUND] = Matrix();
-                    m_WalkAngle[BGROUND] = Matrix();
+					m_WalkAngle[FGROUND] = Matrix();
+					m_WalkAngle[BGROUND] = Matrix();
 				} else {
-                    RunScriptedFunctionInAppropriateScripts("OnStride");
+					RunScriptedFunctionInAppropriateScripts("OnStride");
 				}
 			}
 

Entities/Activity.cpp

@@ -806,8 +806,9 @@ void Activity::Clear() {
 		float totalValue = orbitedCraft->GetTotalValue(0, foreignCostMult, nativeCostMult);
 
 		std::string craftText = "Returned craft";
-		if (!orbitedCraft->IsInventoryEmpty()) { craftText += " + cargo"; }
-
+		if (!orbitedCraft->IsInventoryEmpty()) { 
+			craftText += " + cargo";
+		}
 		if (totalValue > 0.0F) {
 			m_TeamFunds[orbitedCraftTeam] += totalValue;
 			std::snprintf(messageString, sizeof(messageString), "%s added %.0f oz to funds!", craftText.c_str(), totalValue);
@@ -816,10 +817,10 @@ void Activity::Clear() {
 			if (m_IsActive[player]) {
 				if (brainOnBoard && orbitedCraft == GetPlayerBrain(static_cast<Players>(player))) {
 					m_BrainEvacuated[player] = true;
-					g_FrameMan.ClearScreenText(ScreenOfPlayer(ScreenOfPlayer(static_cast<Players>(player))));
+					g_FrameMan.ClearScreenText(ScreenOfPlayer(static_cast<Players>(player)));
 					g_FrameMan.SetScreenText("YOUR BRAIN HAS BEEN EVACUATED BACK INTO ORBIT!", ScreenOfPlayer(static_cast<Players>(player)), 0, 3500);
 				} else if (m_Team[player] == orbitedCraftTeam && totalValue > 0.0F) {
-					g_FrameMan.ClearScreenText(ScreenOfPlayer(ScreenOfPlayer(static_cast<Players>(player))));
+					g_FrameMan.ClearScreenText(ScreenOfPlayer(static_cast<Players>(player)));
 					g_FrameMan.SetScreenText(messageString, ScreenOfPlayer(static_cast<Players>(player)), 0, 3500);
 					m_MessageTimer[player].Reset();
 				}

Entities/MovableObject.cpp

@@ -695,7 +695,7 @@ MovableObject::MovableObject(const MovableObject &reference):
 
 void MovableObject::SetTeam(int team) {
 	SceneObject::SetTeam(team);
-	if (g_ActivityMan.GetActivity()) { g_ActivityMan.GetActivity()->ForceSetTeamAsActive(team); }
+	if (Activity *activity = g_ActivityMan.GetActivity()) { activity->ForceSetTeamAsActive(team); }
 }
 
 //////////////////////////////////////////////////////////////////////////////////////////