Changeset 5892 for code/branches/core5/src/orxonox/gamestates

Timestamp:

Oct 6, 2009, 9:18:40 AM (15 years ago)

Author:

rgrieder

Message:

Removed hard coded sound in Level, Engine and PongBall and replaced SoundMainMenu with a simple SoundBase.

Location:

code/branches/core5/src/orxonox/gamestates

Files:

• GSMainMenu.cc (modified) (3 diffs)
• GSMainMenu.h (modified) (1 diff)

code/branches/core5/src/orxonox/gamestates/GSMainMenu.cc

@@ -39 +39 @@
 #include "core/GUIManager.h"
 #include "Scene.h"
-#include "sound/SoundMainMenu.h"
+#include "sound/SoundBase.h"
 
 namespace orxonox
@@ -62 +62 @@
         {
             // Load sound
-            this->ambient_ = new SoundMainMenu();
+            this->ambient_ = new SoundBase(0);
+            this->ambient_->loadFile("ambient/mainmenu.wav");
         }
     }
@@ -69 +70 @@
     {
         if (GameMode::playsSound())
-        {
-            this->ambient_->destroy();
-        }
+            delete this->ambient_;
 
         InputManager::getInstance().destroyState("mainMenu");

code/branches/core5/src/orxonox/gamestates/GSMainMenu.h

@@ -59 +59 @@
 
         // ambient sound for the main menu
-        SoundMainMenu* ambient_;
+        SoundBase*        ambient_;
     };
 }