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

Timestamp:

Oct 5, 2009, 1:36:33 AM (15 years ago)

Author:

rgrieder

Message:

Added GameMode::playsSound(). This function checks whether sound is available. You MUST NEVER assume that the SoundManager exists and ALWAYS check it (even if graphics is all loaded).
Also cleaned SoundManager c'tor to use Exceptions.

File:

• code/branches/core5/src/orxonox/gamestates/GSMainMenu.cc (modified) (2 diffs)

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

@@ -59 +59 @@
         // and a Camera
         this->camera_ = this->scene_->getSceneManager()->createCamera("mainMenu/Camera");
-        // Load sound
-        this->ambient_ = new SoundMainMenu();
+        if (GameMode::playsSound())
+        {
+            // Load sound
+            this->ambient_ = new SoundMainMenu();
+        }
     }
 
     GSMainMenu::~GSMainMenu()
     {
+        if (GameMode::playsSound())
+        {
+            this->ambient_->destroy();
+        }
+
         InputManager::getInstance().destroyState("mainMenu");
 
@@ -87 +95 @@
         InputManager::getInstance().enterState("mainMenu");
 
-        this->ambient_->play(true);
+        if (GameMode::playsSound())
+        {
+            this->ambient_->play(true);
+        }
     }
 
     void GSMainMenu::deactivate()
     {
-        this->ambient_->stop();
+        if (GameMode::playsSound())
+        {
+            this->ambient_->stop();
+        }
 
         InputManager::getInstance().leaveState("mainMenu");