Changeset 7311 in orxonox.OLD

Timestamp:

Apr 17, 2006, 12:28:16 AM (18 years ago)

Author:

bensch

Message:

minor

Location:

trunk/src

Files:

• lib/sound/ogg_player.cc (modified) (1 diff)
• story_entities/game_world_data.cc (modified) (3 diffs)

trunk/src/lib/sound/ogg_player.cc

@@ -277 +277 @@
   if(!this->stream(this->buffers[0]) || !this->stream(this->buffers[1]))
   {
-    return false;
     SDL_mutexV(this->musicMutex);
+    this->state &= ~OggPlayer::Playing;
+    return false;
   }
 

trunk/src/story_entities/game_world_data.cc

@@ -269 +269 @@
     delete this->localPlayer;
   State::setPlayer(NULL);
+  this->localPlayer = NULL;
+  this->localCamera = NULL;
+  State::setCamera(NULL, NULL);
+  this->sky = NULL;
+  this->terrain = NULL;
 
   nodeList = ClassList::getList(CL_GRAPHICS_EFFECT);
@@ -292 +297 @@
     delete this->objectManager;
   }
+  this->objectManager = NULL;
 
   if(State::getSkyBox())
     State::setSkyBox(NULL);
 
-  glmis = NULL;
-  localCamera = NULL;
-  localPlayer = NULL;
-  State::setCamera(NULL, NULL);
-  sky = NULL;
-  terrain = NULL;
-  objectManager = NULL;
+  this->glmis = NULL;
 }
 
@@ -344 +344 @@
   if (this->music != NULL)
     this->setSoundTrack("");
-  this->music = NULL;
 
   /* unload the shaders */