Changeset 7230 in orxonox.OLD for trunk/src/world_entities

Timestamp:

Mar 21, 2006, 3:20:36 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the std::branche back

Location:

trunk/src/world_entities

Files:

• skybox.cc (modified) (2 diffs)
• world_entity.cc (modified) (2 diffs)

trunk/src/world_entities/skybox.cc

@@ -300 +300 @@
     textureName = "";
   }
-  char* texName;
-  SYNCHELP_READ_STRINGM( texName, NWT_SB_TEXTURENAME );
+  std::string texName;
+  SYNCHELP_READ_STRING( texName, NWT_SB_TEXTURENAME );
 
   this->setSize( size );
@@ -330 +330 @@
 
     SYNCHELP_WRITE_FLOAT(this->size, NWT_SB_SIZE);
-    SYNCHELP_WRITE_STRING(this->textureName.c_str(), NWT_SB_TEXTURENAME);
+    SYNCHELP_WRITE_STRING(this->textureName, NWT_SB_TEXTURENAME);
 
     return SYNCHELP_WRITE_N;

trunk/src/world_entities/world_entity.cc

@@ -519 +519 @@
 int WorldEntity::writeState( const byte * data, int length, int sender )
 {
-  char* modelFileName;
+  std::string modelFileName;
   SYNCHELP_READ_BEGIN();
 
   SYNCHELP_READ_FKT( PNode::writeState, NWT_WE_PN_WRITESTATE );
 
-  SYNCHELP_READ_STRINGM( modelFileName, NWT_WE_PN_MODELFILENAME );
+  SYNCHELP_READ_STRING( modelFileName, NWT_WE_PN_MODELFILENAME );
   SYNCHELP_READ_FLOAT( scaling, NWT_WE_PN_SCALING );
   //check if modelFileName is relative to datadir or absolute
 
 
-  PRINTF(0)("================ LOADING MODEL %s, %f\n", modelFileName, scaling);
-
-  if ( strcmp(modelFileName, "") )
+  PRINTF(0)("================ LOADING MODEL %s, %f\n", modelFileName.c_str(), scaling);
+
+  if ( modelFileName != "" )
   {
     loadModel( modelFileName, scaling);
     PRINTF(0)("modelfilename: %s\n", getModel( 0 )->getName());
   }
-  delete[] modelFileName;
 
   /*SYNCHELP_READ_STRINGM( modelFileName );
@@ -568 +567 @@
   SYNCHELP_WRITE_FKT( PNode::readState, NWT_WE_PN_WRITESTATE );
 
-  if ( getModel(0) && getModel(0)->getName() )
-  {
-    char* name = (char*)(getModel( 0 )->getName());
-
-    if (  ResourceManager::getInstance()->getDataDir() == name ) /// FIXME (do not know what to do here.)
-    {
-      name += ResourceManager::getInstance()->getDataDir().size();
+  if ( getModel(0) && getModel(0)->getName() != "" )
+  {
+    std::string name = getModel( 0 )->getName();
+
+    if (  name.find( ResourceManager::getInstance()->getDataDir() ) == 0 ) 
+    {
+      name.erase(ResourceManager::getInstance()->getDataDir().size());
     }