Changeset 6176 for code/branches

Timestamp:

Nov 29, 2009, 1:36:12 PM (15 years ago)

Author:

dafrick

Message:

Made NewMultiplayerMenu and NewSingleplayerMenu work. Also added hideALLGUIs functionality in InitialiseGUI

Location:

code/branches/presentation2/data/gui/scripts

Files:

• InitialiseGUI.lua (modified) (1 diff)
• NewMultiplayerMenu.lua (modified) (3 diffs)
• NewSingleplayerMenu.lua (modified) (1 diff)

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

@@ -161 +161 @@
 end
 
+function hideAllGUIs()
+    while nrOfActiveSheets ~= 0 do
+        hideGUI(activeSheets[nrOfActiveSheets])
+    end
+end
+
 function keyESC()
     if nrOfActiveSheets > 0 then

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

@@ -20 +20 @@
     local level = ""
     while true do
-      level = orxonox.LevelManager:getInstance():getAvailableLevelListItem(index)
-      if level == "" then
-        break
-      end
-      table.insert(levelList, level)
-      index = index + 1
+        level = orxonox.LevelManager:getInstance():getAvailableLevelListItem(index)
+        if level == "" then
+            break
+        end
+        table.insert(levelList, level)
+        index = index + 1
     end
     table.sort(levelList)
@@ -38 +38 @@
     local multiplayerMode = "startClient"
     if multiplayerMode == "startClient" then
-        window = winMgr:getWindow("orxonox/MultiplayerJoinButton")
-        button = tolua.cast(window,"CEGUI::RadioButton")
+        window = winMgr:getWindow("orxonox/MultiplayerJoinButton")
+        button = tolua.cast(window,"CEGUI::RadioButton")
         button:setSelected(true)
     end
     if multiplayerMode == "startServer" then
-        window = winMgr:getWindow("orxonox/MultiplayerHostButton")
-        button = tolua.cast(window,"CEGUI::RadioButton")
+        window = winMgr:getWindow("orxonox/MultiplayerHostButton")
+        button = tolua.cast(window,"CEGUI::RadioButton")
         button:setSelected(true)
     end
     if multiplayerMode == "startDedicated" then
-        window = winMgr:getWindow("orxonox/MultiplayerDedicatedButton")
-        button = tolua.cast(window,"CEGUI::RadioButton")
+        window = winMgr:getWindow("orxonox/MultiplayerDedicatedButton")
+        button = tolua.cast(window,"CEGUI::RadioButton")
         button:setSelected(true)
     end
@@ -70 +70 @@
 
 function P.MultiplayerStartButton_clicked(e)
-    orxonox.CommandExecutor:execute(multiplayerMode)
-    debug("event: start")
+    local choice = winMgr:getWindow("orxonox/MultiplayerLevelListbox"):getFirstSelectedItem()
+    if choice then
+        orxonox.LevelManager:getInstance():setDefaultLevel(choice:getText() .. ".oxw")
+        orxonox.CommandExecutor:execute(multiplayerMode)
+        hideAllGUIs()
+        debug("event: start")
+    end
 end
 

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

@@ -39 +39 @@
 
 function P.SingleplayerStartButton_clicked(e)
-    -- start game
-    debug("event: start")
+    choice = winMgr:getWindow("orxonox/SingleplayerLevelListbox"):getFirstSelectedItem()
+    if choice then
+        orxonox.LevelManager:getInstance():setDefaultLevel(choice:getText() .. ".oxw")
+        orxonox.CommandExecutor:execute("startGame")
+        hideAllGUIs()
+        debug("event: start")
+    end
 end