Skip to content

Commit c5b915e

Browse files
committed
Use RTEAssert to verify activity running
1 parent dc0e7d6 commit c5b915e

File tree

1 file changed

+8
-6
lines changed

1 file changed

+8
-6
lines changed

Source/Managers/MovableMan.cpp

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

684684
void MovableMan::AddItem(HeldDevice* itemToAdd) {
685685
if (itemToAdd) {
686-
if (g_ActivityMan.ActivityRunning()) {
687-
g_ActivityMan.GetActivity()->ForceSetTeamAsActive(itemToAdd->GetTeam());
688-
}
686+
RTEAssert(g_ActivityMan.ActivityRunning(), "No activity running, can't add items!");
687+
688+
g_ActivityMan.GetActivity()->ForceSetTeamAsActive(itemToAdd->GetTeam());
689+
689690
itemToAdd->SetAsAddedToMovableMan();
690691
itemToAdd->CorrectAttachableAndWoundPositionsAndRotations();
691692

@@ -708,9 +709,10 @@ void MovableMan::AddItem(HeldDevice* itemToAdd) {
708709

709710
void MovableMan::AddParticle(MovableObject* particleToAdd) {
710711
if (particleToAdd) {
711-
if (g_ActivityMan.ActivityRunning()) {
712-
g_ActivityMan.GetActivity()->ForceSetTeamAsActive(particleToAdd->GetTeam());
713-
}
712+
RTEAssert(g_ActivityMan.ActivityRunning(), "No activity running, can't add particles!");
713+
714+
g_ActivityMan.GetActivity()->ForceSetTeamAsActive(particleToAdd->GetTeam());
715+
714716
particleToAdd->SetAsAddedToMovableMan();
715717
if (MOSRotating* particleToAddAsMOSRotating = dynamic_cast<MOSRotating*>(particleToAdd)) {
716718
particleToAddAsMOSRotating->CorrectAttachableAndWoundPositionsAndRotations();

0 commit comments

Comments
 (0)