Changeset 9797 in orxonox.OLD for branches/new_class_id/src/orxonox.cc

Timestamp:

Sep 24, 2006, 11:34:19 AM (18 years ago)

Author:

bensch

Message:

cleaner deletion of NewResourceManager

File:

• branches/new_class_id/src/orxonox.cc (modified) (4 diffs)

branches/new_class_id/src/orxonox.cc

@@ -41 +41 @@
 #include "sound_engine.h"
 #include "util/loading/resource_manager.h"
+#include "util/loading/new_resource_manager.h"
+
 #include "cd_engine.h"
-#include "text_engine.h"
 #include "event_handler.h"
 
@@ -128 +129 @@
 
   // handlers
-  delete ResourceManager::getInstance(); // deletes the Resource Manager
+  NewResourceManager::deleteInstance(); // deletes the Resource Manager
 
   // engines
@@ -327 +328 @@
 
 //#include "util/loading/dynamic_loader.h"
-#include "loading/new_resource_manager.h"
 /**
  * initializes and loads resource files
@@ -352 +352 @@
     PRINTF(1)("The DataDirectory %s could not be verified\n\nh" \
               "!!!  Please Change in File %s Section %s Entry %s to a suitable value !!!\n",
-              NewResourceManager::getInstance()->mainGlobalPath().c_str(),
+              NewResourceManager::getInstance()->mainGlobalPath().name().c_str(),
               this->configFileName.c_str(),
               CONFIG_SECTION_GENERAL,