[Orxonox-commit 1370] r6088 - code/branches/sound3/src/orxonox/sound

[youngk at orxonox.net]

Author: youngk
Date: 2009-11-18 14:18:47 +0100 (Wed, 18 Nov 2009)
New Revision: 6088

Modified:
   code/branches/sound3/src/orxonox/sound/SoundManager.cc
Log:
More or less nicely working sound module. Cross-Fading works well (hacky). Not synchronisable yet.

Modified: code/branches/sound3/src/orxonox/sound/SoundManager.cc
===================================================================
--- code/branches/sound3/src/orxonox/sound/SoundManager.cc	2009-11-18 12:34:14 UTC (rev 6087)
+++ code/branches/sound3/src/orxonox/sound/SoundManager.cc	2009-11-18 13:18:47 UTC (rev 6088)
@@ -254,6 +254,13 @@
 
     void SoundManager::processCrossFading(float dt)
     {
+        
+        // Hacky solution to the fade delay while loading a level.
+        if(dt > 0.2)
+        {
+            return;
+        }
+        
         // FADE IN
         for (std::list<AmbientSound*>::iterator it= this->fadeInList_.begin(); it != this->fadeInList_.end(); it)
         {