Changeset 6987 in orxonox.OLD for trunk/src/story_entities/game_world_data.cc

Timestamp:

Feb 2, 2006, 6:24:50 PM (18 years ago)

Author:

bensch

Message:

trunk: some minor fixes

File:

• trunk/src/story_entities/game_world_data.cc (modified) (2 diffs)

trunk/src/story_entities/game_world_data.cc

@@ -323 +323 @@
 
   if (this->music != NULL)
-    delete this->music;
+    this->setSoundTrack(NULL);
   this->music = NULL;
   /* stop the sound eninge */
@@ -338 +338 @@
   if (this->music != NULL)
     delete this->music;
-
-  PRINTF(3)("Setting Sound Track to %s\n", name);
-  this->music = (OggPlayer*)ResourceManager::getInstance()->load(name, OGG, RP_LEVEL);
-}
-
-
+  this->music = NULL;
+
+  if (name != NULL)
+  {
+    PRINTF(3)("Setting Sound Track to %s\n", name);
+    this->music = (OggPlayer*)ResourceManager::getInstance()->load(name, OGG, RP_LEVEL);
+  }
+}
+
+