Changeset 9918 for code/branches/presentationHS13/src/orxonox/gamestates

Timestamp:

Dec 16, 2013, 3:43:45 PM (11 years ago)

Author:

smerkli

Message:

Merged sfxThilo branch, things seem to be working fine

Location:

code/branches/presentationHS13

Files:

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

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

@@ -85 +85 @@
     {
         if (GameMode::playsSound())
-            this->ambient_->destroy();
+            this->ambient_->destroy(); //CHECK Thilo destroy ?preDestroy()? !!!!!!!
 
         InputManager::getInstance().destroyState("MainMenuHackery");