Changeset 10178 in orxonox.OLD

Timestamp:

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

Author:

bknecht

Message:

fixes for data-directory-structure

Location:

branches/data_fix/src

Files:

• lib/gui/gl/glgui_handler.cc (modified) (1 diff)
• orxonox.cc (modified) (2 diffs)

branches/data_fix/src/lib/gui/gl/glgui_handler.cc

@@ -77 +77 @@
     this->_cursor->setMaxBorders(Vector2D(GraphicsEngine::getInstance()->getResolutionX(), GraphicsEngine::getInstance()->getResolutionY()));
 
-    _cursor->loadTextureSequence(Resources::ResourceManager::getInstance()->mainGlobalPath().name() + "/" + "maps/reap_mouse/reap_mouse_##.png", 1, 49);
+    _cursor->loadTextureSequence(Resources::ResourceManager::getInstance()->mainGlobalPath().name() + "/" + "textures/reap_mouse/reap_mouse_##.png", 1, 49);
 
   }

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);