resolved conflict state with HEAD r14096
[blender.git] / source / gameengine / BlenderRoutines / KX_BlenderKeyboardDevice.h
index 33809f039faab92840d6fd75e59920bd763a3702..932751c37eb39edadd279575f760758573a059ff 100644 (file)
@@ -36,6 +36,7 @@
 
 class KX_BlenderKeyboardDevice : public BL_BlenderInputDevice
 {
+       bool    m_hookesc;
 public:
        KX_BlenderKeyboardDevice();
        virtual ~KX_BlenderKeyboardDevice();
@@ -44,6 +45,7 @@ public:
 //     virtual const SCA_InputEvent&   GetEventValue(SCA_IInputDevice::KX_EnumInputs inputcode);
        virtual bool    ConvertBlenderEvent(unsigned short incode,short val);
        virtual void    NextFrame();
+       virtual void    HookEscape();
 };
 
 #endif //__KX_BLENDERKEYBOARDDEVICE