Changeset 9836 in orxonox.OLD for branches/new_class_id/src/lib/network/network_stream.cc

Timestamp:

Sep 26, 2006, 5:16:10 PM (18 years ago)

Author:

bensch

Message:

orxonox/new_class_id: Taken out the old ResourceManager.
On the way, i had to desintegrate the old MD3-model loading process (via ResourceManager) MD3 is untouched, but also not loaded anymore neither from ResourceMangers nor from the WorldEntity

@patrick: MD3-ModelLoading class must be implemented… this should be quite easy, with the way MD3 is, and the new Resource-paradigm
cheers

File:

• branches/new_class_id/src/lib/network/network_stream.cc (modified) (2 diffs)

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

@@ -41 +41 @@
 
 #include "loading/factory.h"
-#include "loading/new_resource_manager.h"
+#include "loading/resource_manager.h"
 
 #include "debug.h"
@@ -1299 +1299 @@
     length = remainingBytesToWriteToDict;
 
-  std::string fileName = Resources::NewResourceManager::getInstance()->mainGlobalPath().name();
+  std::string fileName = Resources::ResourceManager::getInstance()->mainGlobalPath().name();
   fileName += "/dicts/newdict";