Changeset 6987 in orxonox.OLD for trunk

Timestamp:

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

Author:

bensch

Message:

trunk: some minor fixes

Location:

trunk/src

Files:

• lib/sound/ogg_player.cc (modified) (3 diffs)
• story_entities/game_world_data.cc (modified) (2 diffs)
• world_entities/playable.cc (modified) (4 diffs)
• world_entities/player.cc (modified) (3 diffs)

trunk/src/lib/sound/ogg_player.cc

@@ -47 +47 @@
 }
 
-OggPlayer::~ OggPlayer()
-{
-  this->release();
+OggPlayer::~OggPlayer()
+{
+  //this->release();
 }
 
@@ -80 +80 @@
   if((result = ov_open(oggFile, &oggStream, NULL, 0)) < 0)
   {
-    fclose(oggFile);
-
     PRINTF(2)("Could not open Ogg stream. %s", errorString(result));
     fclose(oggFile);
@@ -204 +202 @@
 bool OggPlayer::stream(ALuint buffer)
 {
+  if (!this->trackLoaded)
+    return false;
   char pcm[BUFFER_SIZE];
   int  size = 0;

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);
+  }
+}
+
+

trunk/src/world_entities/playable.cc

@@ -162 +162 @@
   if (this->currentPlayer != NULL && player != NULL)
   {
-    printf("No Change in Playable\n");
     return false;
   }
@@ -169 +168 @@
   if (this->currentPlayer != NULL && player == NULL)
   {
-    PRINTF(0)("Player gets ejected\n");
+    PRINTF(4)("Player gets ejected\n");
 
     // unsubscibe all events.
@@ -192 +191 @@
   if (this->currentPlayer == NULL && player != NULL)
   {
-    PRINTF(0)("New Player gets inside\n");
+    PRINTF(4)("New Player gets inside\n");
     this->currentPlayer = player;
     if (this->currentPlayer->getPlayable() != this)
@@ -207 +206 @@
   }
 
-  printf("none\n");
   return false;
 }

trunk/src/world_entities/player.cc

@@ -61 +61 @@
   if (this->playable != NULL)
   {
-    printf("Player gets ejected from Playable\n");
+    PRINTF(4)("Player gets ejected from Playable\n");
     this->hud.setEnergyWidget(NULL);
     this->hud.setWeaponManager(NULL);
@@ -73 +73 @@
   if (playable != NULL)
   {
-    printf("Enter new Playable\n");
+    PRINTF(4)("Enter new Playable\n");
       this->playable = playable;
       this->hud.setEnergyWidget(this->playable->getHealthWidget());
@@ -82 +82 @@
   }
 
-  printf("no change\n");
   return true;
 }