[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47700] trunk/blender/source/gameengine: Committing patch [#31704] " Patch to fix keyboard sensor from blocking quit game key binding" by Jay Parker.

[Mitchell Stokes]

Revision: 47700
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47700
Author:   moguri
Date:     2012-06-10 19:32:57 +0000 (Sun, 10 Jun 2012)
Log Message:
-----------
Committing patch [#31704] "Patch to fix keyboard sensor from blocking quit game key binding" by Jay Parker. This patch fixes [#31671] "Keyboard Sensor blocks Quit Game Key Binding"

Modified Paths:
--------------
    trunk/blender/source/gameengine/Converter/KX_ConvertSensors.cpp
    trunk/blender/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp
    trunk/blender/source/gameengine/GameLogic/SCA_KeyboardSensor.h

Modified: trunk/blender/source/gameengine/Converter/KX_ConvertSensors.cpp
===================================================================
--- trunk/blender/source/gameengine/Converter/KX_ConvertSensors.cpp	2012-06-10 18:47:36 UTC (rev 47699)
+++ trunk/blender/source/gameengine/Converter/KX_ConvertSensors.cpp	2012-06-10 19:32:57 UTC (rev 47700)
@@ -302,7 +302,8 @@
 						(blenderkeybdsensor->type == SENS_ALL_KEYS),
 						blenderkeybdsensor->targetName,
 						blenderkeybdsensor->toggleName,
-						gameobj); //			blenderkeybdsensor->pad);
+						gameobj,
+						KX_KetsjiEngine::GetExitKey()); //			blenderkeybdsensor->pad);
 					
 				} 
 				

Modified: trunk/blender/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp
===================================================================
--- trunk/blender/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp	2012-06-10 18:47:36 UTC (rev 47699)
+++ trunk/blender/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp	2012-06-10 19:32:57 UTC (rev 47700)
@@ -54,7 +54,8 @@
 									   bool bAllKeys,
 									   const STR_String& targetProp,
 									   const STR_String& toggleProp,
-									   SCA_IObject* gameobj)
+									   SCA_IObject* gameobj,
+									   short int exitKey)
 	:SCA_ISensor(gameobj,keybdmgr),
 	 m_hotkey(hotkey),
 	 m_qual(qual),
@@ -63,7 +64,7 @@
 	 m_targetprop(targetProp),
 	 m_toggleprop(toggleProp)
 {
-	if (hotkey == SCA_IInputDevice::KX_ESCKEY)
+	if (hotkey == exitKey)
 		keybdmgr->GetInputDevice()->HookEscape();
 //	SetDrawColor(0xff0000ff);
 	Init();

Modified: trunk/blender/source/gameengine/GameLogic/SCA_KeyboardSensor.h
===================================================================
--- trunk/blender/source/gameengine/GameLogic/SCA_KeyboardSensor.h	2012-06-10 18:47:36 UTC (rev 47699)
+++ trunk/blender/source/gameengine/GameLogic/SCA_KeyboardSensor.h	2012-06-10 19:32:57 UTC (rev 47700)
@@ -94,7 +94,8 @@
 					   bool bAllKeys,
 					   const STR_String& targetProp,
 					   const STR_String& toggleProp,
-					   SCA_IObject* gameobj);
+					   SCA_IObject* gameobj,
+					   short int exitKey);
 	virtual ~SCA_KeyboardSensor();
 	virtual CValue* GetReplica();
 	virtual void Init();