Changeset 7203 in orxonox.OLD for branches/std/src/world_entities

Timestamp:

Mar 9, 2006, 5:28:10 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: compiles again, BUT well…. i do not expect it to run anymore

Location:

branches/std/src/world_entities

Files:

• terrain.cc (modified) (2 diffs)
• world_entity.cc (modified) (1 diff)

branches/std/src/world_entities/terrain.cc

@@ -146 +146 @@
   this->heightMap = NULL;
 
-  char* hmName = ResourceManager::getFullName(heightMapFile);
-  char* hmColorName = ResourceManager::getFullName(colorMap);
+  std::string hmName = ResourceManager::getFullName(heightMapFile);
+  std::string hmColorName = ResourceManager::getFullName(colorMap);
 
 
@@ -155 +155 @@
   heightMap->setAbsCoor(this->getAbsCoor());
   heightMap->load();
-  delete[] hmName;
-  delete[] hmColorName;
-
 }
 

branches/std/src/world_entities/world_entity.cc

@@ -575 +575 @@
     char* name = (char*)(getModel( 0 )->getName());
 
-    if ( strstr(name, ResourceManager::getInstance()->getDataDir()) )
-    {
-      name += strlen(ResourceManager::getInstance()->getDataDir());
+    if (  ResourceManager::getInstance()->getDataDir() == name ) /// FIXME (do not know what to do here.)
+    {
+      name += ResourceManager::getInstance()->getDataDir().size();
     }