Force set team as active in MovableObject::SetTeam

Author: fourZK

Entities/Actor.cpp

@@ -608,7 +608,7 @@ bool Actor::HasObjectInGroup(std::string groupName) const
 
 void Actor::SetTeam(int team)
 {
-    SceneObject::SetTeam(team);
+	MovableObject::SetTeam(team);
 
     // Change the Team Icon to display
     m_pTeamIcon = 0;

Entities/MovableObject.cpp

@@ -13,6 +13,7 @@
 
 #include "MovableObject.h"
 
+#include "ActivityMan.h"
 #include "PresetMan.h"
 #include "SceneMan.h"
 #include "ConsoleMan.h"
@@ -692,6 +693,11 @@ MovableObject::MovableObject(const MovableObject &reference):
 }
 */
 
+void MovableObject::SetTeam(int team) {
+	SceneObject::SetTeam(team);
+	if (g_ActivityMan.GetActivity()) { g_ActivityMan.GetActivity()->ForceSetTeamAsActive(team); }
+}
+
 //////////////////////////////////////////////////////////////////////////////////////////
 // Virtual method:  GetAltitude
 //////////////////////////////////////////////////////////////////////////////////////////

Entities/MovableObject.h

@@ -544,6 +544,11 @@ enum MOType
 
     bool GetsHitByMOs() const { return m_GetsHitByMOs; }
 
+	/// <summary>
+	/// Sets the team of this MovableObject.
+	/// </summary>
+	/// <param name="team">The new team to assign.</returns>
+	void SetTeam(int team) override;
 
 //////////////////////////////////////////////////////////////////////////////////////////
 // Method:          SetIgnoresTeamHits

Managers/MovableMan.cpp

@@ -833,7 +833,6 @@ bool MovableMan::AddMO(MovableObject *movableObjectToAdd) {
 
 void MovableMan::AddActor(Actor *actorToAdd) {
 	if (actorToAdd) {
-		g_ActivityMan.GetActivity()->ForceSetTeamAsActive(actorToAdd->GetTeam());
 		actorToAdd->SetAsAddedToMovableMan();
 		actorToAdd->CorrectAttachableAndWoundPositionsAndRotations();
 
@@ -848,6 +847,7 @@ void MovableMan::AddActor(Actor *actorToAdd) {
         }
 
         m_AddedActors.push_back(actorToAdd);
+		// This will call SetTeam and subsequently force the team as active.
 		AddActorToTeamRoster(actorToAdd);
     }
 }