[Orxonox-commit 4690] r9361 - in code/branches/release2012/data/gui: layouts scripts

[jo at orxonox.net]

Author: jo
Date: 2012-09-02 13:55:27 +0200 (Sun, 02 Sep 2012)
New Revision: 9361

Modified:
   code/branches/release2012/data/gui/layouts/CreditsMenu.layout
   code/branches/release2012/data/gui/scripts/AudioMenu.lua
Log:
Modified music menusheet and credits menusheet.

Modified: code/branches/release2012/data/gui/layouts/CreditsMenu.layout
===================================================================
--- code/branches/release2012/data/gui/layouts/CreditsMenu.layout	2012-09-01 15:07:19 UTC (rev 9360)
+++ code/branches/release2012/data/gui/layouts/CreditsMenu.layout	2012-09-02 11:55:27 UTC (rev 9361)
@@ -36,7 +36,7 @@
                         <Property Name="HorzFormatting" Value="HorzCentred" />
                         <Property Name="VertFormatting" Value="TopAligned" />
                         <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{1,0},{1,0}}" />
-                        <Property Name="Text">Orxonox version 0.0.3
+                        <Property Name="Text">Orxonox version 0.0.4
     
     Programming Language:  C++ - lua - tcl
     Environment:  OpenAL - Ogre - OIS - CEGUI - enet - ODE
@@ -45,6 +45,7 @@
     http://www.orxonox.net
     
     Credits:
+    http://www.orxonox.net/wiki/credits
                       </Property>
                     </Window>
                 </Window>

Modified: code/branches/release2012/data/gui/scripts/AudioMenu.lua
===================================================================
--- code/branches/release2012/data/gui/scripts/AudioMenu.lua	2012-09-01 15:07:19 UTC (rev 9360)
+++ code/branches/release2012/data/gui/scripts/AudioMenu.lua	2012-09-02 11:55:27 UTC (rev 9361)
@@ -33,7 +33,6 @@
     table.insert(themeList, "Drum n' Bass")
     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)
         item:setSelectionBrushImage(menuImageSet, "MultiListSelectionBrush")
@@ -45,8 +44,6 @@
         listboxwindow:setItemSelectState(2,true)
     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)
     end
@@ -180,8 +177,6 @@
         orxonox.config("MoodManager", "mood_", "eightbit")
     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")
     end