Changeset 6293 in orxonox.OLD for branches

Timestamp:

Dec 26, 2005, 1:36:19 AM (19 years ago)

Author:

rennerc

Message:

 

Location:

branches/network/src/world_entities

Files:

• world_entity.cc (modified) (6 diffs)
• world_entity.h (modified) (1 diff)

branches/network/src/world_entities/world_entity.cc

@@ -58 +58 @@
 
   this->toList(OM_NULL);
-
-  modelFileName = NULL;
 }
 
@@ -76 +74 @@
 
   State::getObjectManager()->toList(this, OM_INIT);
-
-  if ( modelFileName )
-  delete modelFileName;
 }
 
@@ -106 +101 @@
 void WorldEntity::loadModel(const char* fileName, float scaling, unsigned int modelNumber)
 {
-  this->modelNumber = modelNumber;
-  this->modelScaling = scaling;
-
   if ( fileName != NULL && strcmp(fileName, "") )
   {
-    if ( modelFileName )
-    delete modelFileName;
-    modelFileName = new char[strlen(fileName)+1];
-    strcpy( modelFileName, fileName );
     // search for the special character # in the LoadParam
     if (strchr(fileName, '#') != NULL)
@@ -142 +130 @@
   else
   {
-    if ( modelFileName )
-    delete modelFileName;
-    modelFileName = new char[1];
-    strcpy( modelFileName, "" );
     this->setModel(NULL);
   }
@@ -353 +337 @@
 void WorldEntity::writeState( const byte * data, int length, int sender )
 {
+  char* modelFileName;
   SYNCHELP_READ_BEGIN();
   SYNCHELP_READ_STRINGM( modelFileName );
-  SYNCHELP_READ_FLOAT( modelScaling );
-  SYNCHELP_READ_INT( modelNumber );
+  PRINTF(0)("%s\n", modelFileName );
   loadModel( modelFileName );
+  delete modelFileName;
 }
 
@@ -369 +354 @@
 {
   SYNCHELP_WRITE_BEGIN();
-  SYNCHELP_WRITE_STRING( modelFileName );
-  SYNCHELP_WRITE_FLOAT( modelScaling );
-  SYNCHELP_WRITE_INT( modelNumber );
+  SYNCHELP_WRITE_STRING( getModel( 0 )->getName() );
+  PRINTF(0)("%s\n", getModel( 0 )->getName());
   return SYNCHELP_WRITE_N;
 }

branches/network/src/world_entities/world_entity.h

@@ -88 +88 @@
   OM_LIST                           objectListNumber;   //!< The ObjectList from ObjectManager this Entity is in.
   std::list<WorldEntity*>::iterator objectListIterator; //!< The iterator position of this Entity in the given list of the ObjectManager.
-  char*                   modelFileName;
-  int                     modelNumber;
-  float                   modelScaling;