Changeset 9833 in orxonox.OLD for branches/new_class_id/src/story_entities

Timestamp:

Sep 26, 2006, 4:59:49 PM (18 years ago)

Author:

bensch

Message:

orxonox/new_class_id: almost killed off the old ResourceManager

Location:

branches/new_class_id/src/story_entities

Files:

• game_world.cc (modified) (1 diff)
• game_world_data.cc (modified) (3 diffs)
• menu/game_menu.cc (modified) (1 diff)
• multi_player_world_data.cc (modified) (1 diff)
• story_entity.cc (modified) (2 diffs)

branches/new_class_id/src/story_entities/game_world.cc

@@ -20 +20 @@
 #include "game_world_data.h"
 
-#include "util/loading/resource_manager.h"
 #include "state.h"
 

branches/new_class_id/src/story_entities/game_world_data.cc

@@ -21 +21 @@
 #include "game_world_data.h"
 
-#include "util/loading/resource_manager.h"
 #include "state.h"
 #include "substring.h"
 
 #include "util/loading/game_loader.h"
+#include "util/loading/new_resource_manager.h"
 
 #include "world_entity.h"
@@ -301 +301 @@
 
   // unload the resources loaded in this Level !!
-  ResourceManager::getInstance()->unloadAllByPriority(RP_LEVEL);
+  /// FIXME TODO HACK!!
+//  ResourceManager::getInstance()->unloadAllByPriority(RP_LEVEL);
 
   if (State::getObjectManager() == this->objectManager)
@@ -378 +379 @@
   {
     PRINTF(3)("Setting Sound Track to %s\n", name.c_str());
-    std::string oggFile = ResourceManager::getFullName(name);
+    std::string oggFile = Resources::NewResourceManager::getInstance()->prependAbsoluteMainPath(name);
     this->music = new OrxSound::OggPlayer(oggFile);
     if (this->localPlayer != NULL)

branches/new_class_id/src/story_entities/menu/game_menu.cc

@@ -25 +25 @@
 #include "util/loading/load_param.h"
 #include "util/loading/factory.h"
-#include "util/loading/resource_manager.h"
 
 #include "graphics_engine.h"

branches/new_class_id/src/story_entities/multi_player_world_data.cc

@@ -18 +18 @@
 #include "multi_player_world_data.h"
 
-#include "util/loading/resource_manager.h"
 #include "state.h"
 #include "substring.h"

branches/new_class_id/src/story_entities/story_entity.cc

@@ -22 +22 @@
 #include "story_entity.h"
 
-#include "util/loading/load_param.h"
-#include "util/loading/resource_manager.h"
+#include "loading/load_param.h"
+#include "loading/new_resource_manager.h"
 
 #include "debug.h"
@@ -107 +107 @@
   }
   else
-    this->loadFile = ResourceManager::getFullName(fileName);
+    this->loadFile = Resources::NewResourceManager::getInstance()->prependAbsoluteMainPath(fileName);
 
   this->grabWorldInfo();