Changeset 4010 in orxonox.OLD for orxonox/trunk/src/orxonox.cc

Timestamp:

May 2, 2005, 3:14:57 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the levelloader from lltrunktemp to the trunk. Big thanks to fuzzy to make this so easy for us, and for implementing it in the first place.

File:

• orxonox/trunk/src/orxonox.cc (modified) (3 diffs)

orxonox/trunk/src/orxonox.cc

@@ -34 +34 @@
 #include "resource_manager.h"
 #include "text_engine.h"
+#include "factory.h"
 
 #include <string.h>
@@ -200 +201 @@
   
   this->gameLoader = GameLoader::getInstance();
-  this->gameLoader->loadDebugCampaign(DEBUG_CAMPAIGN_0);
+  this->gameLoader->loadCampaign("../data/worlds/DefaultCampaign.oxc");
+  //  this->gameLoader->loadDebugCampaign(DEBUG_CAMPAIGN_0);
   this->gameLoader->init();
   this->gameLoader->start();
@@ -346 +348 @@
 #include "player.h"
 #include "base_object.h"
+
 #include <asm/msr.h>
 #include <linux/timex.h>