Changeset 917 for code/branches/network/src/orxonox/tools/OrxListener.h

Timestamp:

Mar 21, 2008, 6:14:31 PM (16 years ago)

Author:

rgrieder

Message:

• merged all changes in the input branch into this one
• moved Tickable to core (would have created circular library dependencies)
• exported OrxListener to a separate file, soon to be deleted

changed

, &&, XOR back to or, and, xor because I found the necessary include file for VC++

• created abortRequest() in Orxonox.cc to call for a smooth end of the game (an alternative would be to make tick() return a boolean, like it is with frameStarted())

File:

• code/branches/network/src/orxonox/tools/OrxListener.h (copied) (copied from code/branches/input/src/orxonox/tools/OrxListener.h) (3 diffs)

code/branches/network/src/orxonox/tools/OrxListener.h

@@ -34 +34 @@
 #define _OrxListener_H__
 
+#include <OIS/OISPrereqs.h>
+
 #include "../OrxonoxPrereqs.h"
 #include "audio/AudioPrereqs.h"
 #include "Orxonox.h"
-#include "objects/Tickable.h"
+#include "core/Tickable.h"
 
 namespace orxonox
@@ -44 +46 @@
   {
     public:
-      OrxListener(audio::AudioManager*  auMan, gameMode mode);
+      OrxListener(OIS::Keyboard *keyboard, audio::AudioManager*  auMan, gameMode mode);
 
       void tick(float dt);
@@ -52 +54 @@
       gameMode mode_;
       audio::AudioManager* auMan_;
+      OIS::Keyboard *keyboard_;
   };
 }