Changeset 6634 in orxonox.OLD for trunk/src/world_entities/world_entity.cc

Timestamp:

Jan 21, 2006, 1:18:19 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the network-branche back to the trunk

merged with command:
svn merge ​https://svn.orxonox.net/orxonox/branches/network . -r6500:HEAD
minor conflicts in texture and one Makefile resolved to the trunk

also made a small patch to texture, so it Modulates with GL_REPEAT

File:

• trunk/src/world_entities/world_entity.cc (modified) (4 diffs)

trunk/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;
 
-  SYNCHELP_READ_STRINGM( modelFileName );
+  /*SYNCHELP_READ_STRINGM( modelFileName );
 
   if ( strcmp(modelFileName, "") )
@@ -541 +533 @@
       this->md2TextureFileName = modelFileName;
     }
+  */
 
   return SYNCHELP_READ_N;
@@ -558 +551 @@
   SYNCHELP_WRITE_FKT( PNode::readState );
 
-  SYNCHELP_WRITE_STRING( getModel( 0 )->getName() );
+  if ( getModel(0) && 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
+  {
+    SYNCHELP_WRITE_STRING("");
+  }
+
   SYNCHELP_WRITE_FLOAT( scaling );
-  if ( this->md2TextureFileName!=NULL && strcmp(this->md2TextureFileName, "") )
+  /*if ( this->md2TextureFileName!=NULL && strcmp(this->md2TextureFileName, "") )
   {
     SYNCHELP_WRITE_STRING(this->md2TextureFileName);
@@ -567 +575 @@
   {
     SYNCHELP_WRITE_STRING("");
-  }
+}*/
 
   return SYNCHELP_WRITE_N;