Changeset 9833 in orxonox.OLD for branches/new_class_id/src/lib/network

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/lib/network

Files:

• monitor/network_stats_widget.cc (modified) (2 diffs)
• network_stream.cc (modified) (2 diffs)
• proxy/network_settings.cc (modified) (2 diffs)
• zip.cc (modified) (2 diffs)

branches/new_class_id/src/lib/network/monitor/network_stats_widget.cc

@@ -20 +20 @@
 #include "peer_info.h"
 
+#include "loading/new_resource_manager.h"
+
 #include "multi_type.h"
 
 #include "shell_command.h"
-
-#include "loading/resource_manager.h"
 
 // this fcuk does not work!
@@ -56 +56 @@
 {
   if(_font == NULL)
-    _font = new Font(ResourceManager::getInstance()->getDataDir() + "/fonts/arial.ttf", 20);
+    _font = new Font(Resources::NewResourceManager::getInstance()->mainGlobalPath().name() + "/fonts/arial.ttf", 20);
 
   //this->_name.setFont(*_font);

branches/new_class_id/src/lib/network/network_stream.cc

@@ -36 +36 @@
 #include "zip.h"
 
-#include "src/lib/util/loading/resource_manager.h"
-
 #include "network_log.h"
 
 #include "player_stats.h"
 
-#include "lib/util/loading/factory.h"
+#include "loading/factory.h"
+#include "loading/new_resource_manager.h"
 
 #include "debug.h"
@@ -1300 +1299 @@
     length = remainingBytesToWriteToDict;
 
-  std::string fileName = ResourceManager::getInstance()->getDataDir();
+  std::string fileName = Resources::NewResourceManager::getInstance()->mainGlobalPath().name();
   fileName += "/dicts/newdict";
 

branches/new_class_id/src/lib/network/proxy/network_settings.cc

@@ -21 +21 @@
 #include "shared_network_data.h"
 
-#include "loading/resource_manager.h"
 #include "loading/load_param.h"
-
+#include "loading/new_resource_manager.h"
 #include "debug.h"
 
@@ -65 +64 @@
 void NetworkSettings::loadData()
 {
-  std::string fileName = ResourceManager::getInstance()->getDataDir();
+  std::string fileName = Resources::NewResourceManager::getInstance()->mainGlobalPath().name();
   fileName += "configs/network_settings.conf";
 

branches/new_class_id/src/lib/network/zip.cc

@@ -15 +15 @@
 
 #include "zip.h"
-
-#include "src/lib/util/loading/resource_manager.h"
+#include "loading/new_resource_manager.h"
 #include "debug.h"
 
@@ -51 +50 @@
 int Zip::loadDictionary( std::string name )
 {
-  std::string fileName = ResourceManager::getInstance()->getDataDir();
+  std::string fileName = Resources::NewResourceManager::getInstance()->mainGlobalPath().name();
   //PRINTF(0)("datadir: %s\n", fileName.c_str());
   fileName = fileName + "/dicts/" + name;