diff --git a/source/gameengine/GameLogic/SCA_IController.cpp b/source/gameengine/GameLogic/SCA_IController.cpp index b37b0a596294..401a37dcd7c7 100644 --- a/source/gameengine/GameLogic/SCA_IController.cpp +++ b/source/gameengine/GameLogic/SCA_IController.cpp @@ -191,7 +191,7 @@ void SCA_IController::Activate(SG_DList& head) head.AddFront(&list); } else { - SG_QList& list = m_gameobj->GetActiveActuators(); + SG_QList& list = m_gameobj->GetActiveControllers(); InsertActiveQList(list); head.AddBack(&list); } diff --git a/source/gameengine/GameLogic/SCA_IObject.cpp b/source/gameengine/GameLogic/SCA_IObject.cpp index 35a2ea869b45..dcc49b550486 100644 --- a/source/gameengine/GameLogic/SCA_IObject.cpp +++ b/source/gameengine/GameLogic/SCA_IObject.cpp @@ -42,11 +42,11 @@ SG_QList SCA_IObject::m_activeBookmarkedControllers; SCA_IObject::SCA_IObject() - :m_initState(0), + :m_suspended(false), + m_initState(0), m_state(0), m_firstState(nullptr) { - m_suspended = false; } SCA_IObject::~SCA_IObject() @@ -88,6 +88,11 @@ SG_QList& SCA_IObject::GetActiveActuators() return m_activeActuators; } +SG_QList& SCA_IObject::GetActiveControllers() +{ + return m_activeControllers; +} + SG_QList& SCA_IObject::GetActiveBookmarkedControllers() { return m_activeBookmarkedControllers; diff --git a/source/gameengine/GameLogic/SCA_IObject.h b/source/gameengine/GameLogic/SCA_IObject.h index 0d2c7f677f1c..b58be9de2542 100644 --- a/source/gameengine/GameLogic/SCA_IObject.h +++ b/source/gameengine/GameLogic/SCA_IObject.h @@ -103,6 +103,7 @@ class SCA_IObject : public EXP_Value SCA_SensorList& GetSensors(); SCA_ActuatorList& GetActuators(); SG_QList& GetActiveActuators(); + SG_QList& GetActiveControllers(); static SG_QList& GetActiveBookmarkedControllers(); void AddSensor(SCA_ISensor *act);