Changeset 7587 for code/branches/menu/data/gui/scripts/MultiplayerMenu.lua

Timestamp:

Oct 27, 2010, 1:11:24 PM (14 years ago)

Author:

konrad

Message:

changes in the multiplayer menu, 2 buttons instead of 3: host and join separated.

File:

• code/branches/menu/data/gui/scripts/MultiplayerMenu.lua (modified) (2 diffs)

code/branches/menu/data/gui/scripts/MultiplayerMenu.lua

@@ -8 +8 @@
 
 function P.onShow()
-    if P.multiplayerMode == "startClient" then
-        local window = winMgr:getWindow("orxonox/MultiplayerJoinButton")
-        local button = tolua.cast(window,"CEGUI::RadioButton")
-        button:setSelected(true)
-        P.showServerList()
-    end
-    if P.multiplayerMode == "startServer" then
-        local window = winMgr:getWindow("orxonox/MultiplayerHostButton")
-        local button = tolua.cast(window,"CEGUI::RadioButton")
-        button:setSelected(true)
-        P.showLevelList()
-    end
-    if P.multiplayerMode == "startDedicated" then
-        local window = winMgr:getWindow("orxonox/MultiplayerDedicatedButton")
-        local button = tolua.cast(window,"CEGUI::RadioButton")
-        button:setSelected(true)
-        P.showLevelList()
-    end
+    P.showServerList()
 end
 
@@ -43 +26 @@
 end
 
-function P.MultiplayerStartButton_clicked(e)
+function P.MultiplayerHostButton2_clicked(e)
+    showMenuSheet("HostMenu", true)
+end
+
+
+function P.MultiplayerJoinButton2_clicked(e)
     local choice = winMgr:getWindow("orxonox/MultiplayerListbox"):getFirstSelectedItem()
-    if P.multiplayerMode == "startClient" then
-        if choice then
-            local client = orxonox.Client:getInstance()
-            local index = tolua.cast(choice, "CEGUI::ListboxItem"):getID()
-            client:setDestination( P.serverList[index][2], 55556 )
-        else
-            return
-        end
+    if choice then
+        local client = orxonox.Client:getInstance()
+        local index = tolua.cast(choice, "CEGUI::ListboxItem"):getID()
+        client:setDestination( P.serverList[index][2], 55556 )
     else
-        if choice then
-            orxonox.LevelManager:getInstance():setDefaultLevel(choice:getText() .. ".oxw")
-        else
-            return
-        end
+        return
     end
-    orxonox.execute(P.multiplayerMode)
+    orxonox.execute("startClient")
     hideAllMenuSheets()
 end