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

Timestamp:

Jan 24, 2007, 1:30:29 AM (17 years ago)

Author:

patrick

Message:

merged branche data-fix back to trunk. this breaks compatibility with the old data/trunk data repository! be sure to update your data trunk

File:

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

trunk/src/orxonox.cc

@@ -257 +257 @@
   GraphicsEngine::getInstance()->initFromPreferences();
 
-  std::string iconName = Resources::ResourceManager::getInstance()->prependAbsoluteMainPath("pictures/fighter-top-32x32.bmp");
+  std::string iconName = Resources::ResourceManager::getInstance()->prependAbsoluteMainPath("textures/fighter-top-32x32.bmp");
   if (!iconName.empty())
   {
@@ -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);