Index: code/branches/main_reto_vs05/include/run_manager.h
===================================================================
--- code/branches/main_reto_vs05/include/run_manager.h	(revision 159)
+++ code/branches/main_reto_vs05/include/run_manager.h	(revision 161)
@@ -30,97 +30,93 @@
 #define RUN_MANAGER_H
 
-#include "Ogre.h"
-#include "OgreStringConverter.h"
-#include "OgreException.h"
+#include "OgrePrerequisites.h"
+#include "OgreWindowEventUtilities.h"
+#include "OgreTextureManager.h"
 
-#include "ogre_control.h"
-#include "orxonox_scene.h"
-#include "orxonox_ship.h"
+#include <OIS/OISPrereqs.h>
+
+#include "Orxonox_prerequisites.h"
 
 
-//Use this define to signify OIS will be used as a DLL
-//(so that dll import/export macros are in effect)
-#define OIS_DYNAMIC_LIB
-#include <OIS/OIS.h>
+namespace Orxonox {
 
-using namespace Ogre;
+  // let the class inherit from WindowEventListener in order for the RunMgr
+  // to act as the central point of all the calcuations in Orxonox
+  class RunManager : Ogre::WindowEventListener
+  {
+  public:
+	  RunManager(OgreControl*);
+
+	  virtual ~RunManager();
+
+    virtual bool tick(unsigned long, Ogre::Real);
+
+  protected:
+	  virtual void createCamera(void);
+
+	  virtual void createViewports(void);
 
 
-// let the class inherit from WindowEventListener in order for the RunMgr
-// to act as the central point of all the calcuations in Orxonox
-class RunManager : WindowEventListener
-{
-public:
-	RunManager(OgreControl*);
+	  /** EVENT HANDLING **/
 
-	virtual ~RunManager();
+	  //Adjust mouse clipping area
+	  virtual void windowResized(Ogre::RenderWindow*);
 
-	virtual bool tick(unsigned long, Real);
-
-protected:
-	virtual void createCamera(void);
-
-	virtual void createViewports(void);
+	  //Unattach OIS before window shutdown (very important under Linux)
+	  virtual void windowClosed(Ogre::RenderWindow*);
 
 
-	/** EVENT HANDLING **/
+	  /** INPUT PROCESSING **/
+	  virtual bool processUnbufferedKeyInput();
 
-	//Adjust mouse clipping area
-	virtual void windowResized(RenderWindow*);
-
-	//Unattach OIS before window shutdown (very important under Linux)
-	virtual void windowClosed(RenderWindow*);
+	  virtual bool processUnbufferedMouseInput();
 
 
-	/** INPUT PROCESSING **/
-	virtual bool processUnbufferedKeyInput();
+	  /** OUTPUT **/
 
-	virtual bool processUnbufferedMouseInput();
+	  virtual void updateStats(void);
 
+	  virtual void showDebugOverlay(bool);
 
-	/** OUTPUT **/
+  protected:
+	  Ogre::SceneManager *sceneMgr_;
+	  Ogre::RenderWindow *window_;
+	  Ogre::Camera       *camera_;
+	  OgreControl  *ogre_;
+	  OrxonoxScene *backgroundScene_;
+	  OrxonoxShip  *playerShip_;
 
-	virtual void updateStats(void);
+	  bool statsOn_;
+	  std::string debugText_;
 
-	virtual void showDebugOverlay(bool);
+	  unsigned int screenShotCounter_;
+	  // just to stop toggles flipping too fast
+	  Ogre::Real timeUntilNextToggle_;
+	  bool leftButtonDown_;
+	  Ogre::TextureFilterOptions filtering_;
+	  int aniso_;
 
-protected:
-	OgreControl  *ogre_;
-	SceneManager *sceneMgr_;
-	RenderWindow *window_;
-	OrxonoxScene *backgroundScene_;
-	Camera       *camera_;
-	OrxonoxShip  *playerShip_;
+	  int sceneDetailIndex_;
+	  Ogre::Overlay* debugOverlay_;
 
-	bool statsOn_;
-	std::string debugText_;
+	  //OIS Input devices
+	  OIS::InputManager* inputManager_;
+	  OIS::Mouse*    mouse_;
+	  OIS::Keyboard* keyboard_;
+	  OIS::JoyStick* joystick_;
 
-	unsigned int screenShotCounter_;
-	// just to stop toggles flipping too fast
-	Real timeUntilNextToggle_;
-	bool leftButtonDown_;
-	TextureFilterOptions filtering_;
-	int aniso_;
+    const Ogre::Real mouseSensitivity_;
 
-	int sceneDetailIndex_;
-	Overlay* debugOverlay_;
+    // Bullet array
+	  Bullet **bullets_;
+	  int bulletsSize_;
+	  int bulletsIndex_;
 
-	//OIS Input devices
-	OIS::InputManager* inputManager_;
-	OIS::Mouse*    mouse_;
-	OIS::Keyboard* keyboard_;
-	OIS::JoyStick* joystick_;
+	  // previously elapsed render time
+	  unsigned long totalTime_;
 
-  const Real mouseSensitivity_;
+  };
 
-  // Bullet array
-	Bullet **bullets_;
-	int bulletsSize_;
-	int bulletsIndex_;
-
-	// previously elapsed render time
-	unsigned long totalTime_;
-
-};
+}
 
 #endif /* RUN_MANAGER_H */
