Skip to content

Commit 3b301ef

Browse files
committed
Just if out instead
1 parent 11fa871 commit 3b301ef

File tree

1 file changed

+3
-9
lines changed

1 file changed

+3
-9
lines changed

Source/Managers/MovableMan.cpp

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -652,9 +652,7 @@ bool MovableMan::AddMO(MovableObject* movableObjectToAdd) {
652652
}
653653

654654
void MovableMan::AddActor(Actor* actorToAdd) {
655-
if (actorToAdd) {
656-
RTEAssert(g_ActivityMan.ActivityRunning(), "No activity running, can't add actors!");
657-
655+
if (actorToAdd && g_ActivityMan.ActivityRunning()) {
658656
actorToAdd->SetAsAddedToMovableMan();
659657
actorToAdd->CorrectAttachableAndWoundPositionsAndRotations();
660658

@@ -684,9 +682,7 @@ void MovableMan::AddActor(Actor* actorToAdd) {
684682
}
685683

686684
void MovableMan::AddItem(HeldDevice* itemToAdd) {
687-
if (itemToAdd) {
688-
RTEAssert(g_ActivityMan.ActivityRunning(), "No activity running, can't add items!");
689-
685+
if (itemToAdd && g_ActivityMan.ActivityRunning()) {
690686
g_ActivityMan.GetActivity()->ForceSetTeamAsActive(itemToAdd->GetTeam());
691687

692688
itemToAdd->SetAsAddedToMovableMan();
@@ -710,9 +706,7 @@ void MovableMan::AddItem(HeldDevice* itemToAdd) {
710706
}
711707

712708
void MovableMan::AddParticle(MovableObject* particleToAdd) {
713-
if (particleToAdd) {
714-
RTEAssert(g_ActivityMan.ActivityRunning(), "No activity running, can't add particles!");
715-
709+
if (particleToAdd && g_ActivityMan.ActivityRunning()) {
716710
g_ActivityMan.GetActivity()->ForceSetTeamAsActive(particleToAdd->GetTeam());
717711

718712
particleToAdd->SetAsAddedToMovableMan();

0 commit comments

Comments
 (0)