Changeset 3060 for code/trunk/src/orxonox/gamestates

Timestamp:

May 25, 2009, 3:07:31 PM (16 years ago)

Author:

scheusso

Message:

merged sound2 back to trunk

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/orxonox/gamestates/GSMainMenu.cc (modified) (2 diffs)
• src/orxonox/gamestates/GSMainMenu.h (modified) (1 diff)

code/trunk/src/orxonox/gamestates/GSMainMenu.cc

@@ -40 +40 @@
 #include "objects/Scene.h"
 #include "GraphicsManager.h"
+#include "sound/SoundMainMenu.h"
 
 namespace orxonox
@@ -79 +80 @@
 
         InputManager::getInstance().requestEnterState("mainMenu");
+
+        this->ambient_ = new SoundMainMenu();
+        this->ambient_->play(true);
     }
 
     void GSMainMenu::deactivate()
     {
+        delete this->ambient_;
+
         InputManager::getInstance().requestLeaveState("mainMenu");
         InputManager::getInstance().requestDestroyState("mainMenu");

code/trunk/src/orxonox/gamestates/GSMainMenu.h

@@ -55 +55 @@
         // console commands
         ConsoleCommand* ccStartGame_;
+
+        // ambient sound for the main menu
+        SoundMainMenu* ambient_;
     };
 }