Changeset 9869 in orxonox.OLD for trunk/src/lib/util/loading/game_loader.cc

Timestamp:

Oct 3, 2006, 12:19:30 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the new_class_id branche back to the trunk.
merged with command:
svn merge ​https://svn.orxonox.net/orxonox/branches/new_class_id trunk -r9683:HEAD
no conflicts… puh..

File:

• trunk/src/lib/util/loading/game_loader.cc (modified) (5 diffs)

trunk/src/lib/util/loading/game_loader.cc

@@ -20 +20 @@
 #include "game_loader.h"
 #include "util/loading/load_param.h"
-
-#include "shell_command.h"
+#include "util/loading/resource_manager.h"
+#include "debug.h"
 #include "campaign.h"
 
-#include "util/loading/resource_manager.h"
-
 #include "key_mapper.h"
 
-
-
-SHELL_COMMAND(quit, GameLoader, stop)
-->describe("quits the game")
-->setAlias("orxoquit");
-
+ObjectListDefinition(GameLoader);
 
 GameLoader* GameLoader::singletonRef = NULL;
@@ -43 +36 @@
 GameLoader::GameLoader ()
 {
-  this->setClassID(CL_GAME_LOADER, "GameLoader");
+  this->registerObject(this, GameLoader::_objectList);
   this->setName("GameLoader");
   this->bRun = true;
@@ -57 +50 @@
     delete this->currentCampaign;
   this->currentCampaign = NULL;
-  
+
   GameLoader::singletonRef = NULL;
 }
@@ -90 +83 @@
 {
   ErrorMessage errorCode;
-  std::string campaignName = ResourceManager::getFullName(fileName);
+  std::string campaignName = Resources::ResourceManager::getInstance()->prependAbsoluteMainPath(fileName);
   if (!campaignName.empty())
   {
@@ -110 +103 @@
 {
   ErrorMessage errorCode;
-  std::string campaignName = ResourceManager::getFullName(fileName);
+  std::string campaignName = Resources::ResourceManager::getInstance()->prependAbsoluteMainPath(fileName);
   if (!campaignName.empty())
   {