Changeset 7203 in orxonox.OLD for branches/std/src/world_entities
- Timestamp:
- Mar 9, 2006, 5:28:10 PM (19 years ago)
- Location:
- branches/std/src/world_entities
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/std/src/world_entities/terrain.cc
r7193 r7203 146 146 this->heightMap = NULL; 147 147 148 char*hmName = ResourceManager::getFullName(heightMapFile);149 char*hmColorName = ResourceManager::getFullName(colorMap);148 std::string hmName = ResourceManager::getFullName(heightMapFile); 149 std::string hmColorName = ResourceManager::getFullName(colorMap); 150 150 151 151 … … 155 155 heightMap->setAbsCoor(this->getAbsCoor()); 156 156 heightMap->load(); 157 delete[] hmName;158 delete[] hmColorName;159 160 157 } 161 158 -
branches/std/src/world_entities/world_entity.cc
r7198 r7203 575 575 char* name = (char*)(getModel( 0 )->getName()); 576 576 577 if ( strstr(name, ResourceManager::getInstance()->getDataDir()))578 { 579 name += strlen(ResourceManager::getInstance()->getDataDir());577 if ( ResourceManager::getInstance()->getDataDir() == name ) /// FIXME (do not know what to do here.) 578 { 579 name += ResourceManager::getInstance()->getDataDir().size(); 580 580 } 581 581
Note: See TracChangeset
for help on using the changeset viewer.