Changeset 9794 in orxonox.OLD for branches/new_class_id/src/lib

Timestamp:

Sep 23, 2006, 6:39:32 PM (18 years ago)

Author:

bensch

Message:

slight change in the make process

Location:

branches/new_class_id/src/lib

Files:

• BuildLibs.am (modified) (1 diff)
• shell/some_shell_commands.cc (modified) (2 diffs)
• util/Makefile.am (modified) (1 diff)
• util/loading/game_loader.cc (modified) (2 diffs)
• util/loading/new_resource_manager.cc (modified) (2 diffs)
• util/loading/new_resource_manager.h (modified) (1 diff)
• util/loading/resource.cc (modified) (1 diff)

branches/new_class_id/src/lib/BuildLibs.am

@@ -17 +17 @@
                 $(LIB_PREFIX)/gui/gl/libORXglgui.a \
                 \
-                $(LIB_PREFIX)/util/libORXlibutil.a \
-                \
                 $(LIB_PREFIX)/graphics/importer/libORXimporter.a \
                 $(LIB_PREFIX)/graphics/importer/libtc.a \

branches/new_class_id/src/lib/shell/some_shell_commands.cc

@@ -52 +52 @@
 ->completionPlugin(0, CompletorFileSystem());
 
-#include "loading/resource_manager.h"
-SHELL_COMMAND(debug, ResourceManager, debug);
+#include "loading/new_resource_manager.h"
+SHELL_COMMAND(debug, NewResourceManager, debug);
+
+
 #include "loading/load_param_class_description.h"
 SHELL_COMMAND_STATIC(printAll, LoadParamClassDescription, &LoadParamClassDescription::printAll)
@@ -59 +61 @@
 SHELL_COMMAND_STATIC(capture, LoadParamClassDescription, &LoadParamClassDescription::captureDescriptions)
     ->defaultValues(true);
+
+#include "loading/game_loader.h"
+SHELL_COMMAND(quit, GameLoader, stop)
+    ->describe("quits the game")
+    ->setAlias("orxoquit");
+

branches/new_class_id/src/lib/util/Makefile.am

@@ -15 +15 @@
                 multi_type.cc \
                 \
-                loading/resource_manager.cc \
                 loading/new_resource_manager.cc \
                 loading/resource.cc \

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

@@ -22 +22 @@
 
 #include "debug.h"
-#include "shell_command.h"
 #include "campaign.h"
 
@@ -30 +29 @@
 
 ObjectListDefinition(GameLoader);
-
-
-SHELL_COMMAND(quit, GameLoader, stop)
-->describe("quits the game")
-->setAlias("orxoquit");
-
 
 GameLoader* GameLoader::singletonRef = NULL;

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

@@ -22 +22 @@
 #include <assert.h>
 
-//ObjectListDefinition(NewResourceManager);
+ObjectListDefinition(NewResourceManager);
 
 
@@ -34 +34 @@
 NewResourceManager::NewResourceManager ()
 {
-//  this->registerObject(this, NewResourceManager::_objectList);
+  //this->registerObject(this, NewResourceManager::_objectList);
   this->setName("NewResourceManager");
 

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

@@ -12 +12 @@
 class NewResourceManager : public BaseObject
 {
-//  ObjectListDeclaration(NewResourceManager);
+  ObjectListDeclaration(NewResourceManager);
 public:
   virtual ~NewResourceManager();

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

@@ -134 +134 @@
 {
   NewResourceManager::getInstance()->registerType(this);
-  printf("%s\n", typeName.c_str());
+  PRINTF(4)("Created ResourceType '%s'\n", typeName.c_str());
 }