- Timestamp:
- Sep 23, 2006, 6:39:32 PM (18 years ago)
- Location:
- branches/new_class_id/src
- Files:
-
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/new_class_id/src/Makefile.am
r9760 r9794 42 42 util/kill_target.cc \ 43 43 \ 44 subprojects/benchmark.cc 44 subprojects/benchmark.cc \ 45 \ 46 \ 47 lib/util/loading/resource_manager.cc 45 48 46 49 noinst_HEADERS = \ -
branches/new_class_id/src/lib/BuildLibs.am
r9758 r9794 17 17 $(LIB_PREFIX)/gui/gl/libORXglgui.a \ 18 18 \ 19 $(LIB_PREFIX)/util/libORXlibutil.a \20 \21 19 $(LIB_PREFIX)/graphics/importer/libORXimporter.a \ 22 20 $(LIB_PREFIX)/graphics/importer/libtc.a \ -
branches/new_class_id/src/lib/shell/some_shell_commands.cc
r9779 r9794 52 52 ->completionPlugin(0, CompletorFileSystem()); 53 53 54 #include "loading/resource_manager.h" 55 SHELL_COMMAND(debug, ResourceManager, debug); 54 #include "loading/new_resource_manager.h" 55 SHELL_COMMAND(debug, NewResourceManager, debug); 56 57 56 58 #include "loading/load_param_class_description.h" 57 59 SHELL_COMMAND_STATIC(printAll, LoadParamClassDescription, &LoadParamClassDescription::printAll) … … 59 61 SHELL_COMMAND_STATIC(capture, LoadParamClassDescription, &LoadParamClassDescription::captureDescriptions) 60 62 ->defaultValues(true); 63 64 #include "loading/game_loader.h" 65 SHELL_COMMAND(quit, GameLoader, stop) 66 ->describe("quits the game") 67 ->setAlias("orxoquit"); 68 -
branches/new_class_id/src/lib/util/Makefile.am
r9790 r9794 15 15 multi_type.cc \ 16 16 \ 17 loading/resource_manager.cc \18 17 loading/new_resource_manager.cc \ 19 18 loading/resource.cc \ -
branches/new_class_id/src/lib/util/loading/game_loader.cc
r9727 r9794 22 22 23 23 #include "debug.h" 24 #include "shell_command.h"25 24 #include "campaign.h" 26 25 … … 30 29 31 30 ObjectListDefinition(GameLoader); 32 33 34 SHELL_COMMAND(quit, GameLoader, stop)35 ->describe("quits the game")36 ->setAlias("orxoquit");37 38 31 39 32 GameLoader* GameLoader::singletonRef = NULL; -
branches/new_class_id/src/lib/util/loading/new_resource_manager.cc
r9793 r9794 22 22 #include <assert.h> 23 23 24 //ObjectListDefinition(NewResourceManager);24 ObjectListDefinition(NewResourceManager); 25 25 26 26 … … 34 34 NewResourceManager::NewResourceManager () 35 35 { 36 //this->registerObject(this, NewResourceManager::_objectList);36 //this->registerObject(this, NewResourceManager::_objectList); 37 37 this->setName("NewResourceManager"); 38 38 -
branches/new_class_id/src/lib/util/loading/new_resource_manager.h
r9791 r9794 12 12 class NewResourceManager : public BaseObject 13 13 { 14 //ObjectListDeclaration(NewResourceManager);14 ObjectListDeclaration(NewResourceManager); 15 15 public: 16 16 virtual ~NewResourceManager(); -
branches/new_class_id/src/lib/util/loading/resource.cc
r9793 r9794 134 134 { 135 135 NewResourceManager::getInstance()->registerType(this); 136 printf("%s\n", typeName.c_str());136 PRINTF(4)("Created ResourceType '%s'\n", typeName.c_str()); 137 137 } 138 138
Note: See TracChangeset
for help on using the changeset viewer.