svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r22701:22704
authorCampbell Barton <ideasman42@gmail.com>
Sat, 22 Aug 2009 14:23:54 +0000 (14:23 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Sat, 22 Aug 2009 14:23:54 +0000 (14:23 +0000)
1  2 
source/gameengine/GameLogic/SCA_KeyboardSensor.cpp
source/gameengine/GameLogic/SCA_KeyboardSensor.h

index f065452f8c60152ae170ca737092313ee5571939,a5581f0d9876f1b97ca7702356a1d1235e4e7056..13b32b5446c94dfa60a1b3ceabd4f4e71a65b86f
@@@ -48,9 -48,9 +48,8 @@@ SCA_KeyboardSensor::SCA_KeyboardSensor(
                                                                           bool bAllKeys,
                                                                           const STR_String& targetProp,
                                                                           const STR_String& toggleProp,
 -                                                                         SCA_IObject* gameobj,
 -                                                                         PyTypeObject* T )
 -      :SCA_ISensor(gameobj,keybdmgr,T),
 +                                                                         SCA_IObject* gameobj)
 +      :SCA_ISensor(gameobj,keybdmgr),
-        m_pKeyboardMgr(keybdmgr),
         m_hotkey(hotkey),
         m_qual(qual),
         m_qual2(qual2),
@@@ -604,9 -604,9 +603,9 @@@ KX_PYMETHODDEF_DOC_O(SCA_KeyboardSensor
                return NULL;
        }
        
-       SCA_IInputDevice* inputdev = m_pKeyboardMgr->GetInputDevice();
+       SCA_IInputDevice* inputdev = ((SCA_KeyboardManager *)m_eventmgr)->GetInputDevice();
        const SCA_InputEvent & inevent = inputdev->GetEventValue((SCA_IInputDevice::KX_EnumInputs) keycode);
 -      return PyInt_FromLong(inevent.m_status);
 +      return PyLong_FromSsize_t(inevent.m_status);
  }
  
  /* ------------------------------------------------------------------------- */