Changeset 6543 in orxonox.OLD for branches

Timestamp:

Jan 18, 2006, 2:06:21 PM (19 years ago)

Author:

rennerc

Message:

maybe fixed bug with relative model file names

Location:

branches/network/src

Files:

• lib/lang/base_object.cc (modified) (1 diff)
• world_entities/world_entity.cc (modified) (2 diffs)

branches/network/src/lib/lang/base_object.cc

@@ -218 +218 @@
   SYNCHELP_WRITE_BEGIN();
 
-  PRINTF(0)("objectname = %s\n", this->objectName);
+  //PRINTF(0)("objectname = %s\n", this->objectName);
   SYNCHELP_WRITE_STRING( this->objectName );
 

branches/network/src/world_entities/world_entity.cc

@@ -517 +517 @@
   if ( strcmp(modelFileName, "") )
   {
-
-    if ( strstr(modelFileName, ResourceManager::getInstance()->getDataDir()) )
-    {
-      loadModel( modelFileName+strlen(ResourceManager::getInstance()->getDataDir()), scaling );
-    }
-    else
-    {
-      loadModel( modelFileName, scaling );
-    }
+    loadModel( modelFileName, scaling );
   }
   delete[] modelFileName;
@@ -561 +553 @@
   if ( getModel(0) )
   {
-    SYNCHELP_WRITE_STRING( getModel( 0 )->getName() );
+    char* name = (char*)getModel( 0 )->getName();
+
+    if ( strstr(name, ResourceManager::getInstance()->getDataDir()) )
+    {
+      name += strlen(ResourceManager::getInstance()->getDataDir());
+    }
+
+    SYNCHELP_WRITE_STRING( name );
   }
   else