diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2009-08-22 14:57:07 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2009-08-22 14:57:07 +0400 |
| commit | 1e14ab99926a53fc540f3fb1e2a1e57f0ce559cc (patch) | |
| tree | d94d43f7f663638d1294a1069235059490ba93a9 /source/gameengine/GameLogic/SCA_MouseSensor.cpp | |
| parent | 2aa2512a43781f6ac8937c152398e9de731aef07 (diff) | |
| parent | a4f3f5c23c4201bc885310aa17226d2ee3922a2a (diff) | |
svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r22668:22701
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 c6703452337..e19b5a3956b 100644 --- a/source/gameengine/GameLogic/SCA_MouseSensor.cpp +++ b/source/gameengine/GameLogic/SCA_MouseSensor.cpp @@ -51,7 +51,6 @@ SCA_MouseSensor::SCA_MouseSensor(SCA_MouseManager* eventmgr, short int mousemode, SCA_IObject* gameobj) : SCA_ISensor(gameobj,eventmgr), - m_pMouseMgr(eventmgr), m_x(startx), m_y(starty) { @@ -147,7 +146,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) { @@ -282,7 +281,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 PyLong_FromSsize_t(event.m_status); } |