Changeset 6421 in orxonox.OLD

Timestamp:

Jan 6, 2006, 7:11:34 PM (18 years ago)

Author:

rennerc

Message:

ParamPowerUp now syncs state correctly
fixed a bug in worldEntity

Location:

branches/network/src/world_entities

Files:

• power_ups/param_power_up.cc (modified) (2 diffs)
• world_entity.cc (modified) (3 diffs)

branches/network/src/world_entities/power_ups/param_power_up.cc

@@ -129 +129 @@
   SYNCHELP_READ_FKT( PowerUp::writeState );
 
+  int i;
+  SYNCHELP_READ_INT( i );
+  this->type = (EnumParamPowerUpType)i;
+  SYNCHELP_READ_INT( this->value );
+
+  if ( this->value != 0 )
+  {
+    SYNCHELP_READ_INT( this->min_value );
+    SYNCHELP_READ_INT( this->max_value );
+  }
+
   return SYNCHELP_READ_N;
 }
@@ -151 +162 @@
     SYNCHELP_WRITE_FKT( PowerUp::readState );
 
+    int i = this->type;
+    SYNCHELP_WRITE_INT( i );
+    SYNCHELP_WRITE_INT( this->value );
+
+    if ( this->value != 0 )
+    {
+      SYNCHELP_WRITE_INT( this->min_value );
+      SYNCHELP_WRITE_INT( this->max_value );
+    }
+
     return SYNCHELP_WRITE_N;
   }

branches/network/src/world_entities/world_entity.cc

@@ -49 +49 @@
 
   this->obbTree = NULL;
+
+  this->md2TextureFileName = NULL;
 
   if (root != NULL)
@@ -384 +386 @@
   SYNCHELP_READ_FLOAT( scaling );
   //check if modelFileName is relative to datadir or absolute
-  if ( strstr(modelFileName, ResourceManager::getInstance()->getDataDir()) )
-  {
-    loadModel( modelFileName+strlen(ResourceManager::getInstance()->getDataDir()), scaling );
-  }
-  else
-  {
-    loadModel( modelFileName, scaling );
+
+  if ( strcmp(modelFileName, "") )
+  {
+
+    if ( strstr(modelFileName, ResourceManager::getInstance()->getDataDir()) )
+   {
+     loadModel( modelFileName+strlen(ResourceManager::getInstance()->getDataDir()), scaling );
+   }
+    else
+   {
+     loadModel( modelFileName, scaling );
+   }
   }
   delete[] modelFileName;
+
+  SYNCHELP_READ_STRINGM( modelFileName );
+  if ( strcmp(modelFileName, "") )
+    this->md2TextureFileName = modelFileName;
 
   return SYNCHELP_READ_N;
@@ -411 +422 @@
   SYNCHELP_WRITE_STRING( getModel( 0 )->getName() );
   SYNCHELP_WRITE_FLOAT( scaling );
+  if ( this->md2TextureFileName!=NULL && strcmp(this->md2TextureFileName, "") )
+  {
+    SYNCHELP_WRITE_STRING(this->md2TextureFileName);
+  }
+  else
+  {
+    SYNCHELP_WRITE_STRING("");
+  }
+
   return SYNCHELP_WRITE_N;
 }