Changeset 5881 for code/branches/core5

Timestamp:

Oct 5, 2009, 6:28:21 PM (15 years ago)

Author:

rgrieder

Message:

Fixed sound problem in Pong by correcting the assumptions that you will always have sound.

Location:

code/branches/core5/src

Files:

• modules/pong/PongBall.cc (modified) (10 diffs)
• modules/pong/PongBall.h (modified) (1 diff)
• orxonox/sound/SoundManager.cc (modified) (1 diff)

code/branches/core5/src/modules/pong/PongBall.cc

@@ -41 +41 @@
     const float PongBall::MAX_REL_Z_VELOCITY = 1.5;
 
-    PongBall::PongBall(BaseObject* creator) : MovableEntity(creator)
+    PongBall::PongBall(BaseObject* creator)
+        : MovableEntity(creator)
+        , sidesound_(NULL)
+        , batsound_(NULL)
+        , scoresound_(NULL)
     {
         RegisterObject(PongBall);
@@ -54 +58 @@
         this->registerVariables();
 
-        this->sidesound_ = new SoundBase(this);
-        this->sidesound_->loadFile("sounds/pong_side.wav");
-
-        this->batsound_ = new SoundBase(this);
-        this->batsound_->loadFile("sounds/pong_bat.wav");
-
-        this->scoresound_ = new SoundBase(this);
-        this->scoresound_->loadFile("sounds/pong_score.wav");
+        if (GameMode::playsSound())
+        {
+            this->sidesound_ = new SoundBase(this);
+            this->sidesound_->loadFile("sounds/pong_side.wav");
+
+            this->batsound_ = new SoundBase(this);
+            this->batsound_->loadFile("sounds/pong_bat.wav");
+
+            this->scoresound_ = new SoundBase(this);
+            this->scoresound_->loadFile("sounds/pong_score.wav");
+        }
+    }
+
+    PongBall::~PongBall()
+    {
+        if (this->sidesound_)
+            delete this->sidesound_;
+        if (this->batsound_)
+            delete this->batsound_;
+        if (this->scoresound_)
+            delete this->scoresound_;
     }
 
@@ -87 +104 @@
             {
                 velocity.z = -velocity.z;
-                this->sidesound_->play();
+                if (GameMode::playsSound())
+                    this->sidesound_->play();
 
                 if (position.z > this->fieldHeight_ / 2)
@@ -109 +127 @@
                             velocity.x = -velocity.x;
                             velocity.z = distance * distance * sgn(distance) * PongBall::MAX_REL_Z_VELOCITY * this->speed_;
-                            this->batsound_->play();
+                            if (GameMode::playsSound())
+                                this->batsound_->play();
                         }
                         else if (position.x > this->fieldWidth_ / 2 * (1 + this->relMercyOffset_))
@@ -116 +135 @@
                             {
                                 this->getGametype()->playerScored(this->bat_[0]->getPlayer());
-                                this->scoresound_->play();
+                                if (GameMode::playsSound())
+                                    this->scoresound_->play();
                                 return;
                             }
@@ -129 +149 @@
                             velocity.x = -velocity.x;
                             velocity.z = distance * distance * sgn(distance) * PongBall::MAX_REL_Z_VELOCITY * this->speed_;
-                            this->batsound_->play();
+                            if (GameMode::playsSound())
+                                this->batsound_->play();
                         }
                         else if (position.x < -this->fieldWidth_ / 2 * (1 + this->relMercyOffset_))
@@ -135 +156 @@
                             if (this->getGametype() && this->bat_[1])
                             {
-                                this->scoresound_->play();
+                                if (GameMode::playsSound())
+                                    this->scoresound_->play();
                                 this->getGametype()->playerScored(this->bat_[1]->getPlayer());
                                 return;
@@ -157 +179 @@
           {
             velocity.z = -velocity.z;
-            this->sidesound_->play();
+            if (GameMode::playsSound())
+                this->sidesound_->play();
 
             if (position.z > this->fieldHeight_ / 2)
@@ -178 +201 @@
                   position.x = this->fieldWidth_ / 2;
                   velocity.x = -velocity.x;
-                  this->batsound_->play();
+                  if (GameMode::playsSound())
+                    this->batsound_->play();
                   velocity.z = distance * distance * sgn(distance) * PongBall::MAX_REL_Z_VELOCITY * this->speed_;
                 }
@@ -189 +213 @@
                   position.x = -this->fieldWidth_ / 2;
                   velocity.x = -velocity.x;
-                  this->batsound_->play();
+                  if (GameMode::playsSound())
+                    this->batsound_->play();
                   velocity.z = distance * distance * sgn(distance) * PongBall::MAX_REL_Z_VELOCITY * this->speed_;
                 }

code/branches/core5/src/modules/pong/PongBall.h

@@ -41 +41 @@
         public:
             PongBall(BaseObject* creator);
-            virtual ~PongBall() {}
+            virtual ~PongBall();
 
             virtual void tick(float dt);

code/branches/core5/src/orxonox/sound/SoundManager.cc

@@ -73 +73 @@
         else
             COUT(4) << "OpenAL ALUT supported MIME types: " << str << std::endl;
-        ThrowException(InitialisationFailed, "Just testing");
 
         GameMode::setPlaysSound(true);