Changeset 6337 in orxonox.OLD for branches/network/src/world_entities/world_entity.cc

Timestamp:

Dec 30, 2005, 1:32:46 AM (18 years ago)

Author:

rennerc

Message:

groundturret now scales correctly on client

File:

• branches/network/src/world_entities/world_entity.cc (modified) (3 diffs)

branches/network/src/world_entities/world_entity.cc

@@ -121 +121 @@
 
     PRINTF(4)("fetching %s\n", fileName);
+    this->scaling = scaling;
     if (scaling == 1.0)
       this->setModel((Model*)ResourceManager::getInstance()->load(fileName, OBJ, RP_CAMPAIGN), modelNumber);
@@ -343 +344 @@
 
   SYNCHELP_READ_STRINGM( modelFileName );
+  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()) );
+    loadModel( modelFileName+strlen(ResourceManager::getInstance()->getDataDir()), scaling );
   }
   else
   {
-    loadModel( modelFileName );
+    loadModel( modelFileName, scaling );
   }
   delete[] modelFileName;
@@ -370 +372 @@
 
   SYNCHELP_WRITE_STRING( getModel( 0 )->getName() );
-  PRINTF(0)("%s\n", getModel( 0 )->getName());
+  SYNCHELP_WRITE_FLOAT( scaling );
   return SYNCHELP_WRITE_N;
 }