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

Timestamp:

Mar 9, 2008, 4:44:36 PM (17 years ago)

Author:

landauf

Message:

merged core branch to trunk

File:

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

code/trunk/src/orxonox/Orxonox.h

@@ -14 +14 @@
 
 #include "OrxonoxPrereqs.h"
-#include "loader/LoaderPrereqs.h"
+//#include "loader/LoaderPrereqs.h"
 #include "audio/AudioPrereqs.h"
 
@@ -69 +69 @@
       GraphicsEngine*       ogre_;          //!< our dearest graphics engine <3
       std::string           dataPath_;      //!< path to data
-      loader::LevelLoader*  loader_;        //!< level loader builds the scene
+//      loader::LevelLoader*  loader_;        //!< level loader builds the scene
       audio::AudioManager*  auMan_;         //!< audio manager
       BulletManager*        bulletMgr_;     //!< Keeps track of the thrown bullets