Changeset 1219 for code/trunk/src/core/InputBuffer.h

Timestamp:

May 2, 2008, 10:44:57 PM (17 years ago)

Author:

rgrieder

Message:

merged input branch back to trunk. Not yet tested on tardis

File:

• code/trunk/src/core/InputBuffer.h (modified) (3 diffs)

code/trunk/src/core/InputBuffer.h

@@ -35 +35 @@
 #include <list>
 
-#ifdef WIN32
-#include <OIS/OISKeyboard.h>
-#else
-#include <OISKeyboard.h>
-#endif
+#include "ois/OISKeyboard.h"
+#include "InputHandler.h"
 
 namespace orxonox
@@ -46 +43 @@
     {};
 
-    class _CoreExport InputBuffer : public OIS::KeyListener
+    class _CoreExport InputBuffer : public KeyHandler
     {
         struct InputBufferListenerTuple
@@ -115 +112 @@
             bool keyPressed(const OIS::KeyEvent &e);
             bool keyReleased(const OIS::KeyEvent &e);
+            bool keyHeld(const OIS::KeyEvent &e) { return true; }
 
             OIS::Keyboard* keyboard_;