Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed
  • code/branches/presentation2/data/gui/scripts/AudioMenu.lua

    r6363 r6370  
    1818    musicscrollbar_active = false
    1919    effectsscrollbar_active = false
    20     mastervolume = soundMgr:getVolume(orxonox.SoundType.none)
    21     musicvolume = soundMgr:getVolume(orxonox.SoundType.ambient)
    22     effectsvolume = soundMgr:getVolume(orxonox.SoundType.effects)
    23     mastermute = soundMgr:getMute(orxonox.SoundType.none)
    24     musicmute = soundMgr:getMute(orxonox.SoundType.ambient)
    25     effectsmute = soundMgr:getMute(orxonox.SoundType.effects)
     20    mastervolume = soundMgr:getVolume(orxonox.SoundType.All)
     21    musicvolume = soundMgr:getVolume(orxonox.SoundType.Music)
     22    effectsvolume = soundMgr:getVolume(orxonox.SoundType.Effects)
     23    mastermute = soundMgr:getMute(orxonox.SoundType.All)
     24    musicmute = soundMgr:getMute(orxonox.SoundType.Music)
     25    effectsmute = soundMgr:getMute(orxonox.SoundType.Effects)
    2626    masterscrollbarwindow = tolua.cast(winMgr:getWindow("orxonox/MasterScrollbar"),"CEGUI::Scrollbar")
    2727    musicscrollbarwindow = tolua.cast(winMgr:getWindow("orxonox/MusicScrollbar"),"CEGUI::Scrollbar")
     
    131131        end
    132132    end
    133     soundMgr:toggleMute(orxonox.SoundType.none)
     133    soundMgr:toggleMute(orxonox.SoundType.All)
    134134end
    135135
     
    146146        end
    147147    end
    148     soundMgr:toggleMute(orxonox.SoundType.ambient)
     148    soundMgr:toggleMute(orxonox.SoundType.Music)
    149149end
    150150
     
    161161        end
    162162    end
    163     soundMgr:toggleMute(orxonox.SoundType.effects)
     163    soundMgr:toggleMute(orxonox.SoundType.Effects)
    164164end
    165165
Note: See TracChangeset for help on using the changeset viewer.