Changeset 2058 for code/branches/lod/src/orxonox

Timestamp:

Oct 29, 2008, 4:00:45 PM (17 years ago)

Author:

rgrieder

Message:

Reverted unintentional changes in lod branch.

Location:

code/branches/lod/src/orxonox

Files:

• OrxonoxStableHeaders.h (modified) (1 diff)
• gamestates/GSLevel.cc (modified) (3 diffs)

code/branches/lod/src/orxonox/OrxonoxStableHeaders.h

@@ -46 +46 @@
 #endif
 #include <Ogre.h>
-#include <OgreProgressiveMesh.h>
 #include <CEGUI.h>
 #include <boost/thread/recursive_mutex.hpp>

code/branches/lod/src/orxonox/gamestates/GSLevel.cc

@@ -38 +38 @@
 #include "core/CommandExecutor.h"
 #include "core/ConsoleCommand.h"
+#include "core/CommandLine.h"
 #include "core/ConfigValueIncludes.h"
 #include "core/CoreIncludes.h"
@@ -49 +50 @@
 namespace orxonox
 {
+    SetCommandLineArgument(level, "sample.oxw").setShortcut("l");
+
     GSLevel::GSLevel(const std::string& name)
         : GameState<GSGraphics>(name)
@@ -157 +160 @@
         // call the loader
         COUT(0) << "Loading level..." << std::endl;
-        startLevel_ = new Level(Settings::getDataPath() + "levels/sample.oxw");
+        std::string levelName;
+        CommandLine::getValue("level", &levelName);
+        startLevel_ = new Level(Settings::getDataPath() + std::string("levels/") + levelName);
         Loader::open(startLevel_);
     }