Changeset 5211 in orxonox.OLD for trunk/src/story_entities

Timestamp:

Sep 21, 2005, 2:21:41 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: valgrind mem-leak-recovered

Location:

trunk/src/story_entities

Files:

• campaign.cc (modified) (1 diff)
• world.cc (modified) (3 diffs)

trunk/src/story_entities/campaign.cc

@@ -161 +161 @@
     }
     delete this->entities;
+    delete it;
 }
 

trunk/src/story_entities/world.cc

@@ -165 +165 @@
   this->setName(name);
   this->debugWorldNr = worldID;
-
+  this->gameTime = 0.0f;
   this->setSpeed(1.0);
   this->music = NULL;
+  this->shell = NULL;
+  this->entities = NULL;
 }
 
@@ -259 +261 @@
   // load the parameters
   // name
-  char* temp;
   const char* string = grabParameter( root, "name");
   if( string == NULL)
     {
       PRINTF(2)("World is missing a proper 'name'\n");
-      string = "Unknown";
-      temp = new char[strlen(string)+1];
-      strcpy( temp, string);
-      this->setName(temp);
+      this->setName("Unknown");
     }
   else
     {
-      temp = new char[strlen(string )+1];
-      strcpy( temp, string);
-      this->setName(temp);
+      this->setName(string);
     }
 
@@ -478 +474 @@
   ClassList::debug();
 
-  this->music = (OggPlayer*)ResourceManager::getInstance()->load("sound/00-luke_grey_-_hypermode.ogg", OGG, RP_LEVEL);
-  music->playback();
+  this->music = NULL;//(OggPlayer*)ResourceManager::getInstance()->load("sound/00-luke_grey_-_hypermode.ogg", OGG, RP_LEVEL);
+  //music->playback();
 }