Changeset 637 for code/branches/FICN/src/orxonox/Orxonox.h

Timestamp:

Dec 19, 2007, 1:49:24 AM (16 years ago)

Author:

rgrieder

Message:

 

File:

• code/branches/FICN/src/orxonox/Orxonox.h (modified) (2 diffs)

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

@@ -36 +36 @@
       void die(/* some error code */);
       static Orxonox* getSingleton();
-      inline Ogre::SceneManager* getSceneManager() { return ogre_->getSceneManager(); };
-      inline GraphicsEngine* getOgrePointer() { return ogre_; };
+      inline Ogre::SceneManager* getSceneManager()         { return ogre_->getSceneManager(); };
+      inline GraphicsEngine* getOgrePointer()              { return ogre_; };
       inline audio::AudioManager* getAudioManagerPointer() { return auMan_; };
-      inline OIS::Keyboard* getKeyboard() { return this->keyboard_; }
-      inline OIS::Mouse* getMouse() { return this->mouse_; }
+      inline OIS::Keyboard* getKeyboard()                  { return this->keyboard_; }
+      inline OIS::Mouse* getMouse()                        { return this->mouse_; }
+      inline BulletManager* getBulletMgr()                 { return this->bulletMgr_; }
 
     private:
@@ -67 +68 @@
       loader::LevelLoader*  loader_;    //!< level loader builds the scene
       audio::AudioManager*  auMan_;     //!< audio manager
+      BulletManager*        bulletMgr_; //!< Keeps track of the thrown bullets
       static Orxonox*       singletonRef_;
       OIS::Keyboard*        keyboard_;