Changeset 6294 in orxonox.OLD

Timestamp:

Dec 26, 2005, 2:29:09 AM (18 years ago)

Author:

rennerc

Message:

 

File:

• branches/network/src/world_entities/world_entity.cc (modified) (1 diff)

branches/network/src/world_entities/world_entity.cc

@@ -340 +340 @@
   SYNCHELP_READ_BEGIN();
   SYNCHELP_READ_STRINGM( modelFileName );
-  PRINTF(0)("%s\n", modelFileName );
-  loadModel( modelFileName );
-  delete modelFileName;
+  //check if modelFileName is relative to datadir or absolute
+  if ( strstr(modelFileName, ResourceManager::getInstance()->getDataDir()) )
+  {
+    loadModel( modelFileName+strlen(ResourceManager::getInstance()->getDataDir()) );
+  }
+  else
+  {
+    loadModel( modelFileName );
+  }
+  delete[] modelFileName;
 }