resolved conflict state with HEAD r14096
[blender.git] / source / gameengine / BlenderRoutines / KX_BlenderKeyboardDevice.h
index b9edfca96c496120a05e6b9c8d5cfc81f33cc3cc..932751c37eb39edadd279575f760758573a059ff 100644 (file)
 #ifndef __KX_BLENDERKEYBOARDDEVICE
 #define __KX_BLENDERKEYBOARDDEVICE
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include "KX_BlenderInputDevice.h"
 
 class KX_BlenderKeyboardDevice : public BL_BlenderInputDevice
 {
+       bool    m_hookesc;
 public:
        KX_BlenderKeyboardDevice();
        virtual ~KX_BlenderKeyboardDevice();
@@ -48,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