Changeset 10178 in orxonox.OLD for branches/data_fix/src/orxonox.cc

Timestamp:

Jan 3, 2007, 6:52:31 PM (17 years ago)

Author:

bknecht

Message:

fixes for data-directory-structure

File:

• branches/data_fix/src/orxonox.cc (modified) (2 diffs)

branches/data_fix/src/orxonox.cc

@@ -365 +365 @@
 
   //! @todo this is a hack and should be loadable
-  Resources::ResourceManager::getInstance()->addResourceSubPath("Texture", "maps");
-  Resources::ResourceManager::getInstance()->addResourceSubPath("Texture", "pictures");
-
-  Resources::ResourceManager::getInstance()->addResourceSubPath("SoundBuffer", "sound");
+  Resources::ResourceManager::getInstance()->addResourceSubPath("Texture", "textures");
+  //Resources::ResourceManager::getInstance()->addResourceSubPath("Texture", "pictures");
+
+  Resources::ResourceManager::getInstance()->addResourceSubPath("SoundBuffer", "sounds");
   Resources::ResourceManager::getInstance()->addResourceSubPath("SoundBuffer", "music");
 
@@ -410 +410 @@
 
   if( this->port != -1)
-    this->gameLoader->loadNetworkCampaign("worlds/DefaultNetworkCampaign.oxc");
+    this->gameLoader->loadNetworkCampaign("levels/DefaultNetworkCampaign.oxc");
   else
-    this->gameLoader->loadCampaign("worlds/DefaultCampaign.oxc");                       /* start orxonox in single player mode */
+    this->gameLoader->loadCampaign("levels/DefaultCampaign.oxc");                       /* start orxonox in single player mode */
 
   //  this->gameLoader->loadDebugCampaign(DEBUG_CAMPAIGN_0);