Changeset 873 for code/branches/core2/src/orxonox/Orxonox.h

Timestamp:

Mar 9, 2008, 5:27:07 PM (17 years ago)

Author:

landauf

Message:

simplified core2 branch

File:

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

code/branches/core2/src/orxonox/Orxonox.h

@@ -15 +15 @@
 #include "OrxonoxPrereqs.h"
 //#include "loader/LoaderPrereqs.h"
-#include "audio/AudioPrereqs.h"
+//#include "audio/AudioPrereqs.h"
 
 #include "GraphicsEngine.h"
@@ -41 +41 @@
       inline Ogre::SceneManager* getSceneManager()         { return ogre_->getSceneManager(); };
       inline GraphicsEngine* getOgrePointer()              { return ogre_; };
-      inline audio::AudioManager* getAudioManagerPointer() { return auMan_; };
+//      inline audio::AudioManager* getAudioManagerPointer() { return auMan_; };
       inline OIS::Keyboard* getKeyboard()                  { return this->keyboard_; }
       inline OIS::Mouse* getMouse()                        { return this->mouse_; }
-      inline BulletManager* getBulletMgr()                 { return this->bulletMgr_; }
+//      inline BulletManager* getBulletMgr()                 { return this->bulletMgr_; }
 
     private:
@@ -70 +70 @@
       std::string           dataPath_;      //!< path to data
 //      loader::LevelLoader*  loader_;        //!< level loader builds the scene
-      audio::AudioManager*  auMan_;         //!< audio manager
-      BulletManager*        bulletMgr_;     //!< Keeps track of the thrown bullets
+//      audio::AudioManager*  auMan_;         //!< audio manager
+//      BulletManager*        bulletMgr_;     //!< Keeps track of the thrown bullets
       static Orxonox*       singletonRef_;
       OIS::Keyboard*        keyboard_;