Changeset 1024 for code/trunk/src/orxonox/Orxonox.h

Timestamp:

Apr 10, 2008, 5:35:49 PM (16 years ago)

Author:

rgrieder

Message:

merged input back into trunk
note: I have created an asylum with obsolete code, please check the files

File:

• code/trunk/src/orxonox/Orxonox.h (modified) (3 diffs)

code/trunk/src/orxonox/Orxonox.h

@@ -17 +17 @@
 
 #include "GraphicsEngine.h"
-#include "InputEventListener.h"
+#include "core/InputEventListener.h"
 
 
@@ -44 +44 @@
 
       static Orxonox* getSingleton();
-      static void destroy();
+      static void destroySingleton();
 
    private:
@@ -75 +75 @@
       audio::AudioManager*  auMan_;         //!< audio manager
       BulletManager*        bulletMgr_;     //!< Keeps track of the thrown bullets
-      InputHandler*         inputHandler_;  //!< Handles input with key bindings
+      InputManager*         inputHandler_;  //!< Handles input with key bindings
       Ogre::Root*           root_;          //!< Holy grail of Ogre
       Ogre::Timer*          timer_;         //!< Main loop timer