Revision: 22704
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=22704
Author: campbellbarton
Date: 2009-08-22 16:19:27 +0200 (Sat, 22 Aug 2009)
Log Message:
-----------
missed this in last commit. keyboard event manager was stored twice.
Modified Paths:
--------------
trunk/blender/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp
trunk/blender/source/gameengine/GameLogic/SCA_KeyboardSensor.h
Modified: trunk/blender/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp
===================================================================
--- trunk/blender/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp
2009-08-22 11:51:26 UTC (rev 22703)
+++ trunk/blender/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp
2009-08-22 14:19:27 UTC (rev 22704)
@@ -51,7 +51,6 @@
SCA_IObject* gameobj,
PyTypeObject* T )
:SCA_ISensor(gameobj,keybdmgr,T),
- m_pKeyboardMgr(keybdmgr),
m_hotkey(hotkey),
m_qual(qual),
m_qual2(qual2),
@@ -126,7 +125,7 @@
bool qual_change = false;
short int m_val_orig = m_val;
- SCA_IInputDevice* inputdev = m_pKeyboardMgr->GetInputDevice();
+ SCA_IInputDevice* inputdev = ((SCA_KeyboardManager
*)m_eventmgr)->GetInputDevice();
// cerr << "SCA_KeyboardSensor::Eval event, sensing for "<<
m_hotkey << " at device " << inputdev << "\n";
/* See if we need to do logging: togPropState exists and is
@@ -361,7 +360,7 @@
*/
bool SCA_KeyboardSensor::IsShifted(void)
{
- SCA_IInputDevice* inputdev = m_pKeyboardMgr->GetInputDevice();
+ SCA_IInputDevice* inputdev = ((SCA_KeyboardManager
*)m_eventmgr)->GetInputDevice();
if (
(inputdev->GetEventValue(SCA_IInputDevice::KX_RIGHTSHIFTKEY).m_status
== SCA_InputEvent::KX_ACTIVE)
@@ -380,7 +379,7 @@
void SCA_KeyboardSensor::LogKeystrokes(void)
{
- SCA_IInputDevice* inputdev = m_pKeyboardMgr->GetInputDevice();
+ SCA_IInputDevice* inputdev = ((SCA_KeyboardManager
*)m_eventmgr)->GetInputDevice();
int num = inputdev->GetNumActiveEvents();
/* weird loop, this one... */
@@ -515,7 +514,7 @@
{
ShowDeprecationWarning("getPressedKeys()", "events");
- SCA_IInputDevice* inputdev = m_pKeyboardMgr->GetInputDevice();
+ SCA_IInputDevice* inputdev = ((SCA_KeyboardManager
*)m_eventmgr)->GetInputDevice();
int num = inputdev->GetNumJustEvents();
PyObject* resultlist = PyList_New(num);
@@ -556,7 +555,7 @@
{
ShowDeprecationWarning("getCurrentlyPressedKeys()", "events");
- SCA_IInputDevice* inputdev = m_pKeyboardMgr->GetInputDevice();
+ SCA_IInputDevice* inputdev = ((SCA_KeyboardManager
*)m_eventmgr)->GetInputDevice();
int num = inputdev->GetNumActiveEvents();
PyObject* resultlist = PyList_New(num);
@@ -605,7 +604,7 @@
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);
}
@@ -691,7 +690,7 @@
{
SCA_KeyboardSensor* self= static_cast<SCA_KeyboardSensor*>(self_v);
- SCA_IInputDevice* inputdev = self->m_pKeyboardMgr->GetInputDevice();
+ SCA_IInputDevice* inputdev = ((SCA_KeyboardManager
*)self->m_eventmgr)->GetInputDevice();
PyObject* resultlist = PyList_New(0);
Modified: trunk/blender/source/gameengine/GameLogic/SCA_KeyboardSensor.h
===================================================================
--- trunk/blender/source/gameengine/GameLogic/SCA_KeyboardSensor.h
2009-08-22 11:51:26 UTC (rev 22703)
+++ trunk/blender/source/gameengine/GameLogic/SCA_KeyboardSensor.h
2009-08-22 14:19:27 UTC (rev 22704)
@@ -43,9 +43,7 @@
class SCA_KeyboardSensor : public SCA_ISensor
{
Py_Header;
- class SCA_KeyboardManager* m_pKeyboardMgr;
-
/**
* the key this sensor is sensing for
*/
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
