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

Timestamp:

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

Author:

landauf

Message:

merged core branch to trunk

File:

• code/trunk/src/orxonox/Orxonox.cc (modified) (4 diffs)

code/trunk/src/orxonox/Orxonox.cc

@@ -57 +57 @@
 
 // loader and audio
-#include "loader/LevelLoader.h"
+//#include "loader/LevelLoader.h"
 #include "audio/AudioManager.h"
 
@@ -72 +72 @@
 #include "core/Factory.h"
 #include "core/Debug.h"
+#include "core/Loader.h"
 #include "hud/HUD.h"
 #include "objects/weapon/BulletManager.h"
@@ -131 +132 @@
     this->ogre_ = new GraphicsEngine();
     this->dataPath_ = "";
-    this->loader_ = 0;
+//    this->loader_ = 0;
     this->auMan_ = 0;
     this->singletonRef_ = 0;
@@ -379 +380 @@
 
     // load this file from config
-    loader_ = new loader::LevelLoader("sample.oxw");
-    loader_->loadLevel();
+//    loader_ = new loader::LevelLoader("sample.oxw");
+//    loader_->loadLevel();
+    Level* startlevel = new Level("levels/sample.oxw");
+    Loader::open(startlevel);
 
     Ogre::Overlay* hudOverlay = Ogre::OverlayManager::getSingleton().getByName("Orxonox/HUD1.2");