diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2009-09-25 20:30:15 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2009-09-25 20:30:15 +0400 |
| commit | aa989c1e8343cb761665129d44e03a4fc4c7cd95 (patch) | |
| tree | bc7af2fbee186fb0d1ea563b8d43e79f5af30f0a /source/gameengine/Ketsji | |
| parent | 9f6566c0a57ae136a819a461c43092a998c69f77 (diff) | |
almost all event managers stored a pointer back to the logic manager, easier if this pointer is in the base class - SCA_EventManager
Diffstat (limited to 'source/gameengine/Ketsji')
5 files changed, 3 insertions, 7 deletions
diff --git a/source/gameengine/Ketsji/KXNetwork/KX_NetworkEventManager.cpp b/source/gameengine/Ketsji/KXNetwork/KX_NetworkEventManager.cpp index 738f64713b0..65f7d98253c 100644 --- a/source/gameengine/Ketsji/KXNetwork/KX_NetworkEventManager.cpp +++ b/source/gameengine/Ketsji/KXNetwork/KX_NetworkEventManager.cpp @@ -45,7 +45,7 @@ KX_NetworkEventManager::KX_NetworkEventManager(class SCA_LogicManager* logicmgr, class NG_NetworkDeviceInterface *ndi) : -SCA_EventManager(NETWORK_EVENTMGR), m_logicmgr(logicmgr), m_ndi(ndi) +SCA_EventManager(logicmgr, NETWORK_EVENTMGR), m_ndi(ndi) { //printf("KX_NetworkEventManager constructor\n"); } diff --git a/source/gameengine/Ketsji/KXNetwork/KX_NetworkEventManager.h b/source/gameengine/Ketsji/KXNetwork/KX_NetworkEventManager.h index ae88f1d4987..fd776640bcf 100644 --- a/source/gameengine/Ketsji/KXNetwork/KX_NetworkEventManager.h +++ b/source/gameengine/Ketsji/KXNetwork/KX_NetworkEventManager.h @@ -34,7 +34,6 @@ class KX_NetworkEventManager : public SCA_EventManager { - class SCA_LogicManager* m_logicmgr; class NG_NetworkDeviceInterface* m_ndi; public: diff --git a/source/gameengine/Ketsji/KX_RayEventManager.h b/source/gameengine/Ketsji/KX_RayEventManager.h index 27c9be14d1f..030dae525e1 100644 --- a/source/gameengine/Ketsji/KX_RayEventManager.h +++ b/source/gameengine/Ketsji/KX_RayEventManager.h @@ -41,8 +41,7 @@ class KX_RayEventManager : public SCA_EventManager class SCA_LogicManager* m_logicmgr; public: KX_RayEventManager(class SCA_LogicManager* logicmgr) - : SCA_EventManager(RAY_EVENTMGR), - m_logicmgr(logicmgr) + : SCA_EventManager(logicmgr, RAY_EVENTMGR) {} virtual void NextFrame(); diff --git a/source/gameengine/Ketsji/KX_TouchEventManager.cpp b/source/gameengine/Ketsji/KX_TouchEventManager.cpp index 712a512995e..6b454f6a338 100644 --- a/source/gameengine/Ketsji/KX_TouchEventManager.cpp +++ b/source/gameengine/Ketsji/KX_TouchEventManager.cpp @@ -40,8 +40,7 @@ KX_TouchEventManager::KX_TouchEventManager(class SCA_LogicManager* logicmgr, PHY_IPhysicsEnvironment* physEnv) - : SCA_EventManager(TOUCH_EVENTMGR), - m_logicmgr(logicmgr), + : SCA_EventManager(logicmgr, TOUCH_EVENTMGR), m_physEnv(physEnv) { //notm_scene->addTouchCallback(STATIC_RESPONSE, KX_TouchEventManager::collisionResponse, this); diff --git a/source/gameengine/Ketsji/KX_TouchEventManager.h b/source/gameengine/Ketsji/KX_TouchEventManager.h index 6da37d615a4..e6414a2e285 100644 --- a/source/gameengine/Ketsji/KX_TouchEventManager.h +++ b/source/gameengine/Ketsji/KX_TouchEventManager.h @@ -43,7 +43,6 @@ class PHY_IPhysicsEnvironment; class KX_TouchEventManager : public SCA_EventManager { typedef std::pair<PHY_IPhysicsController*, PHY_IPhysicsController*> NewCollision; - class SCA_LogicManager* m_logicmgr; PHY_IPhysicsEnvironment* m_physEnv; std::set<NewCollision> m_newCollisions; |