Changeset 9216 for code/branches/presentation2012

Timestamp:

May 18, 2012, 4:32:28 PM (13 years ago)

Author:

smerkli

Message:

merged branch spacegate

Location:

code/branches/presentation2012

Files:

• . (modified) (1 prop)
• data/gui/scripts/AudioMenu.lua (modified) (3 diffs)

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

@@ -34 +34 @@
     table.insert(themeList, "8-Bit Style")
     table.insert(themeList, "Corny Jazz")
+    table.insert(themeList, "Metal")
     for k,v in pairs(themeList) do
         item = CEGUI.createListboxTextItem(v)
@@ -45 +46 @@
     elseif orxonox.getConfig("MoodManager", "mood_") == "jazzy" then
         listboxwindow:setItemSelectState(3,true)
+    elseif orxonox.getConfig("MoodManager", "mood_") == "metal" then
+        listboxwindow:setItemSelectState(4,true)
     else
         listboxwindow:setItemSelectState(0,true)
@@ -178 +181 @@
     elseif listboxwindow:isItemSelected(3) then
         orxonox.config("MoodManager", "mood_", "jazzy")
+    elseif listboxwindow:isItemSelected(4) then
+        orxonox.config("MoodManager", "mood_", "metal")
     else
         orxonox.config("MoodManager", "mood_", "default")