Changeset 6328 in orxonox.OLD

Timestamp:

Dec 28, 2005, 2:41:52 AM (18 years ago)

Author:

rennerc

Message:

fixed some bugs

Location:

branches/network/src

Files:

• lib/network/converter.cc (modified) (1 diff)
• world_entities/skybox.cc (modified) (3 diffs)
• world_entities/skybox.h (modified) (2 diffs)
• world_entities/world_entity.cc (modified) (1 diff)

branches/network/src/lib/network/converter.cc

@@ -467 +467 @@
   int n = Converter::byteArrayToInt( a, &length );
 
-  s = new char[n+1];
+  s = new char[length+1];
 
   if ( !s )

branches/network/src/world_entities/skybox.cc

@@ -80 +80 @@
     }
   this->setParentMode(PNODE_MOVEMENT);
+
+  this->textureName = NULL;
 }
 
@@ -98 +100 @@
     delete this->material[i];
   delete[] this->material;
+  if (this->textureName)
+  {
+    delete[] this->textureName;
+    this->textureName = NULL;
+  }
  }
 
@@ -220 +227 @@
   SYNCHELP_READ_BEGIN();
   SYNCHELP_READ_FLOAT( size );
-  SYNCHELP_READ_STRING( textureName, 1024 );
+  if ( textureName )
+  {
+    delete[] textureName;
+    textureName = NULL;
+  }
+  SYNCHELP_READ_STRINGM( textureName );
 
   PRINT(0)("GOT DATA: size=%f texture='%s'\n", size, textureName);

branches/network/src/world_entities/skybox.h

@@ -35 +35 @@
   void setSize(float size);
   /** assumes jpg as input-format */
-  void setTexture(const char* name) { strncpy(textureName, name, 1024); this->setTextureAndType (name, "jpg"); };
+  void setTexture(const char* name) { if (textureName) delete[] textureName; textureName = new char[strlen(name)+1]; strcpy(textureName, name); this->setTextureAndType (name, "jpg"); };
 
   void setTextureAndType(const char* name, const char* extension);
@@ -51 +51 @@
   Material**      material;          //!< Materials for the SkyBox. sorted by number (0-5) top, bottom, left, right, front, back
   float           size;              //!< Size of the SkyBox. This should match the frustum maximum range.
-  char            textureName[1024]; //!< Name of the Texture
+  char*           textureName;       //!< Name of the Texture
 
 };

branches/network/src/world_entities/world_entity.cc

@@ -349 +349 @@
     loadModel( modelFileName );
   }
-  //delete []modelFileName;
+  delete[] modelFileName;
 }