Changeset 9855 in orxonox.OLD for branches/new_class_id

Timestamp:

Sep 28, 2006, 5:50:25 PM (18 years ago)

Author:

bensch

Message:

includes

Location:

branches/new_class_id/src

Files:

• lib/util/loading/factory.cc (modified) (1 diff)
• lib/util/loading/fast_factory.cc (modified) (1 diff)
• lib/util/loading/load_param.h (modified) (1 diff)
• lib/util/loading/resource_manager.cc (modified) (1 diff)
• orxonox.cc (modified) (1 diff)

branches/new_class_id/src/lib/util/loading/factory.cc

@@ -15 +15 @@
 #define DEBUG_SPECIAL_MODULE DEBUG_MODULE_LOADING
 
-#include "util/loading/factory.h"
+#include "factory.h"
 #include "debug.h"
 //#include "shell_command.h"

branches/new_class_id/src/lib/util/loading/fast_factory.cc

@@ -19 +19 @@
 #include "compiler.h"
 #include "debug.h"
-#include <string.h>
 
 

branches/new_class_id/src/lib/util/loading/load_param.h

@@ -21 +21 @@
 #ifndef _LOAD_PARAM_H
 #define _LOAD_PARAM_H
-
-#include "base_object.h"
 
 #include "executor/executor_substring.h"

branches/new_class_id/src/lib/util/loading/resource_manager.cc

@@ -48 +48 @@
   ResourceManager::~ResourceManager ()
   {
+    this->unloadAllBelowKeepLevel(this->_keepLevelNames.size());
     ResourceManager::_singletonRef = NULL;
   }

branches/new_class_id/src/orxonox.cc

@@ -136 +136 @@
   delete EventHandler::getInstance();
 
+  Resources::ResourceManager::deleteInstance();
   // output-buffer
   delete OrxShell::ShellBuffer::getInstance();