Skip to content

Commit 4cc9735

Browse files
committed
Only perform activity actions when activity is running
When game starts, there is no activity running yet, but when loading data through `g_PresetMan.LoadAllDataModules()` call in `main()`, this will get executed and call a member function on a nullptr.
1 parent 22c1aa5 commit 4cc9735

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

Source/Managers/MovableMan.cpp

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -683,7 +683,9 @@ void MovableMan::AddActor(Actor* actorToAdd) {
683683

684684
void MovableMan::AddItem(HeldDevice* itemToAdd) {
685685
if (itemToAdd) {
686-
g_ActivityMan.GetActivity()->ForceSetTeamAsActive(itemToAdd->GetTeam());
686+
if (g_ActivityMan.ActivityRunning()) {
687+
g_ActivityMan.GetActivity()->ForceSetTeamAsActive(itemToAdd->GetTeam());
688+
}
687689
itemToAdd->SetAsAddedToMovableMan();
688690
itemToAdd->CorrectAttachableAndWoundPositionsAndRotations();
689691

@@ -706,7 +708,9 @@ void MovableMan::AddItem(HeldDevice* itemToAdd) {
706708

707709
void MovableMan::AddParticle(MovableObject* particleToAdd) {
708710
if (particleToAdd) {
709-
g_ActivityMan.GetActivity()->ForceSetTeamAsActive(particleToAdd->GetTeam());
711+
if (g_ActivityMan.ActivityRunning()) {
712+
g_ActivityMan.GetActivity()->ForceSetTeamAsActive(particleToAdd->GetTeam());
713+
}
710714
particleToAdd->SetAsAddedToMovableMan();
711715
if (MOSRotating* particleToAddAsMOSRotating = dynamic_cast<MOSRotating*>(particleToAdd)) {
712716
particleToAddAsMOSRotating->CorrectAttachableAndWoundPositionsAndRotations();

0 commit comments

Comments
 (0)