Changeset 9836 in orxonox.OLD for branches/new_class_id/src/world_entities/world_entity.cc
- Timestamp:
- Sep 26, 2006, 5:16:10 PM (18 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/new_class_id/src/world_entities/world_entity.cc
r9832 r9836 20 20 #include "shell_command.h" 21 21 22 #include "util/loading/ new_resource_manager.h"22 #include "util/loading/resource_manager.h" 23 23 #include "resource_obj.h" 24 24 #include "md2/md2Model.h" … … 162 162 std::string name = fileName; 163 163 164 if ( name.find( Resources:: NewResourceManager::getInstance()->mainGlobalPath().name() ) == 0 )165 { 166 name.erase(Resources:: NewResourceManager::getInstance()->mainGlobalPath().name().size());164 if ( name.find( Resources::ResourceManager::getInstance()->mainGlobalPath().name() ) == 0 ) 165 { 166 name.erase(Resources::ResourceManager::getInstance()->mainGlobalPath().name().size()); 167 167 } 168 168 … … 180 180 { 181 181 lodFile[offset] = 48+(int)i; 182 if (Resources:: NewResourceManager::getInstance()->checkFileInMainPath( lodFile))182 if (Resources::ResourceManager::getInstance()->checkFileInMainPath( lodFile)) 183 183 this->loadModel(lodFile, scaling, i); 184 184 } … … 220 220 { 221 221 PRINTF(4)("fetching MD3 file: %s\n", fileName.c_str()); 222 Model* m = new md3::MD3Model(fileName, this->scaling);223 this->setModel(m, 0);222 // Model* m = new md3::MD3Model(fileName, this->scaling); 223 // this->setModel(m, 0); 224 224 225 225 // if( m != NULL)
Note: See TracChangeset
for help on using the changeset viewer.