archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r22668:22701

Browse Source
This commit is contained in:
Campbell Barton
2009-08-22 10:57:07 +00:00
parent 2aa2512a43 a4f3f5c23c
commit 1e14ab9992
10 changed files with 23 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
source/gameengine/GameLogic/SCA_MouseSensor.cpp
View File

@@ -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);
}