diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2009-08-22 14:51:21 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2009-08-22 14:51:21 +0400 |
| commit | a4f3f5c23c4201bc885310aa17226d2ee3922a2a (patch) | |
| tree | b3917aa3080313b0bc963ef815f1632a94e9a911 /source/gameengine/GameLogic/SCA_MouseSensor.cpp | |
| parent | 93dd95b6c2c9ed69916060aa438c13ba1ee6431f (diff) | |
- BGE, Some sensors, stored the event manager in 2 places (became confusing to do changes in this area)
- Change compiler warnings for linux/scons/C++
Diffstat (limited to 'source/gameengine/GameLogic/SCA_MouseSensor.cpp')
| -rw-r--r-- | source/gameengine/GameLogic/SCA_MouseSensor.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/source/gameengine/GameLogic/SCA_MouseSensor.cpp b/source/gameengine/GameLogic/SCA_MouseSensor.cpp index c5e1c3c0441..1a0a3939d54 100644 --- a/source/gameengine/GameLogic/SCA_MouseSensor.cpp +++ b/source/gameengine/GameLogic/SCA_MouseSensor.cpp @@ -52,7 +52,6 @@ SCA_MouseSensor::SCA_MouseSensor(SCA_MouseManager* eventmgr, SCA_IObject* gameobj, PyTypeObject* T) : SCA_ISensor(gameobj,eventmgr, T), - m_pMouseMgr(eventmgr), m_x(startx), m_y(starty) { @@ -148,7 +147,7 @@ bool SCA_MouseSensor::Evaluate() { bool result = false; bool reset = m_reset && m_level; - SCA_IInputDevice* mousedev = m_pMouseMgr->GetInputDevice(); + SCA_IInputDevice* mousedev = ((SCA_MouseManager *)m_eventmgr)->GetInputDevice(); m_reset = false; switch (m_mousemode) { @@ -283,7 +282,7 @@ KX_PYMETHODDEF_DOC_O(SCA_MouseSensor, getButtonStatus, return NULL; } - SCA_IInputDevice* mousedev = m_pMouseMgr->GetInputDevice(); + SCA_IInputDevice* mousedev = ((SCA_MouseManager *)m_eventmgr)->GetInputDevice(); const SCA_InputEvent& event = mousedev->GetEventValue((SCA_IInputDevice::KX_EnumInputs) button); return PyInt_FromLong(event.m_status); } |