Changeset 6370 for code/branches/presentation2/data

Timestamp:

Dec 17, 2009, 11:10:39 AM (15 years ago)

Author:

rgrieder

Message:

Little cleanup in sound stuff and MoodManager.
Caution: Renamed SoundTypes to {All, Music, Effects}!

File:

• code/branches/presentation2/data/gui/scripts/AudioMenu.lua (modified) (4 diffs)

code/branches/presentation2/data/gui/scripts/AudioMenu.lua

@@ -18 +18 @@
     musicscrollbar_active = false
     effectsscrollbar_active = false
-    mastervolume = soundMgr:getVolume(orxonox.SoundType.none)
-    musicvolume = soundMgr:getVolume(orxonox.SoundType.ambient)
-    effectsvolume = soundMgr:getVolume(orxonox.SoundType.effects)
-    mastermute = soundMgr:getMute(orxonox.SoundType.none)
-    musicmute = soundMgr:getMute(orxonox.SoundType.ambient)
-    effectsmute = soundMgr:getMute(orxonox.SoundType.effects)
+    mastervolume = soundMgr:getVolume(orxonox.SoundType.All)
+    musicvolume = soundMgr:getVolume(orxonox.SoundType.Music)
+    effectsvolume = soundMgr:getVolume(orxonox.SoundType.Effects)
+    mastermute = soundMgr:getMute(orxonox.SoundType.All)
+    musicmute = soundMgr:getMute(orxonox.SoundType.Music)
+    effectsmute = soundMgr:getMute(orxonox.SoundType.Effects)
     masterscrollbarwindow = tolua.cast(winMgr:getWindow("orxonox/MasterScrollbar"),"CEGUI::Scrollbar")
     musicscrollbarwindow = tolua.cast(winMgr:getWindow("orxonox/MusicScrollbar"),"CEGUI::Scrollbar")
@@ -131 +131 @@
         end
     end
-    soundMgr:toggleMute(orxonox.SoundType.none)
+    soundMgr:toggleMute(orxonox.SoundType.All)
 end
 
@@ -146 +146 @@
         end
     end
-    soundMgr:toggleMute(orxonox.SoundType.ambient)
+    soundMgr:toggleMute(orxonox.SoundType.Music)
 end
 
@@ -161 +161 @@
         end
     end
-    soundMgr:toggleMute(orxonox.SoundType.effects)
+    soundMgr:toggleMute(orxonox.SoundType.Effects)
 end