UPBGE: Use CM_ListRemoveIfFound in SCA_IObject.

UPBGE · Dec 31, 2017 · 48e2862 · 48e2862
1 parent 986e236
commit 48e2862
Showing 1 changed file with 4 additions and 16 deletions.
diff --git a/source/gameengine/GameLogic/SCA_IObject.cpp b/source/gameengine/GameLogic/SCA_IObject.cpp
@@ -38,6 +38,8 @@
 #include "SCA_IActuator.h"
 #include "EXP_ListValue.h"
 
+#include "CM_List.h"
+
 SG_QList SCA_IObject::m_activeBookmarkedControllers;
 
 SCA_IObject::SCA_IObject()
@@ -152,14 +154,7 @@ void SCA_IObject::RegisterActuator(SCA_IActuator *act)
 
 void SCA_IObject::UnregisterActuator(SCA_IActuator *act)
 {
-	for (SCA_ActuatorList::iterator ita = m_registeredActuators.begin(); ita != m_registeredActuators.end();) {
-		if (*ita == act) {
-			ita = m_registeredActuators.erase(ita);
-		}
-		else {
-			++ita;
-		}
-	}
+	CM_ListRemoveIfFound(m_registeredActuators, act);
 }
 
 void SCA_IObject::RegisterObject(SCA_IObject *obj)
@@ -171,14 +166,7 @@ void SCA_IObject::RegisterObject(SCA_IObject *obj)
 
 void SCA_IObject::UnregisterObject(SCA_IObject *obj)
 {
-	for (SCA_ObjectList::iterator ito = m_registeredObjects.begin(); ito != m_registeredObjects.end();) {
-		if (*ito == obj) {
-			ito = m_registeredObjects.erase(ito);
-		}
-		else {
-			++ito;
-		}
-	}
+	CM_ListRemoveIfFound(m_registeredObjects, obj);
 }
 
 bool SCA_IObject::UnlinkObject(SCA_IObject *clientobj)