Changeset 8079 for code/trunk/data/gui/scripts/MultiplayerMenu.lua

Timestamp:

Mar 15, 2011, 9:47:11 PM (14 years ago)

Author:

landauf

Message:

merged usability branch back to trunk

incomplete summary of the changes in this branch:

• enhanced keyboard navigation in GUIs
• implemented new graphics menu and changeable window size at runtime
• added developer mode
• HUD shows if game is paused, game pauses if ingame menu is opened
• removed a few obsolete commands and hid some that are more for internal use
• numpad works in console and gui
• faster loading of level info
• enhanced usage of compositors (Shader class)
• improved camera handling, configurable FOV and aspect ratio

Location:

code/trunk

Files:

• . (modified) (1 prop)
• data/gui/scripts/MultiplayerMenu.lua (modified) (6 diffs)

code/trunk/data/gui/scripts/MultiplayerMenu.lua

@@ -2 +2 @@
 
 local P = createMenuSheet("MultiplayerMenu")
-
-P.buttonList = {}
 
 --joinMode is 1 for choice "LAN" and 2 for "Internet"
@@ -10 +8 @@
 
 function P.onLoad()
-    P.multiplayerMode = "startClient" 
+    P.multiplayerMode = "startClient"
 
-    --button are arranged in a 2x2 matrix, the left lower item is nil
-    local item = {
+    --button are arranged in a 3x2 matrix, Join and Host buttons are in the upper left and middle, the back button in the lower right of the table
+    P:setButton(1, 1, {
             ["button"] = winMgr:getWindow("orxonox/MultiplayerJoinButton"),
-            ["function"]  = P.MultiplayerJoinButton_clicked
-    }
-    P.buttonList[1] = item
+            ["callback"]  = P.MultiplayerJoinButton_clicked
+    })
 
-    local item = {
+    P:setButton(1, 2, {
             ["button"] = winMgr:getWindow("orxonox/MultiplayerHostButton"),
-            ["function"]  = P.MultiplayerHostButton_clicked
-    }
-    P.buttonList[2] = item
+            ["callback"]  = P.MultiplayerHostButton_clicked
+    })
 
-    local item = {
+    P:setButton(2, 3, {
             ["button"] = winMgr:getWindow("orxonox/MultiplayerBackButton"),
-            ["function"]  = P.MultiplayerBackButton_clicked
-    }
-    P.buttonList[4] = item
+            ["callback"]  = P.MultiplayerBackButton_clicked
+    })
 end
 
@@ -35 +30 @@
     --P.showServerList()
 
-    --indices to iterate through buttonlist
-    P.oldindex = -2
-    P.index = -1
-    
     if P.joinMode == 1 then
         local window = winMgr:getWindow("orxonox/MultiplayerLanButton")
@@ -56 +47 @@
     P.joinMode = 1
     if button:isSelected() == true then
-            P.showServerList()
+        P.showServerList()
     end
 end
@@ -65 +56 @@
     P.joinMode = 2
     if button:isSelected() == true then
-            P.showServerList()
-        end
+        P.showServerList()
+    end
 end
 
@@ -92 +83 @@
 
 function P.showServerList()
-        -- LAN Discovery
-        if P.joinMode == 1 then
-                local listbox = winMgr:getWindow("orxonox/MultiplayerListbox")
-                CEGUI.toListbox(listbox):resetList()
-                local discovery = orxonox.LANDiscovery:getInstance()
-                discovery:discover()
-                P.serverList = {}
-                local index = 0
-                local servername = ""
-                local serverip = ""
-                while true do
-                    servername = discovery:getServerListItemName(index)
-                    if servername == "" then
-                        break
-                    end
-                    serverip = discovery:getServerListItemIP(index)
-                    if serverip == "" then
-                      break
-                    end
-                    table.insert(P.serverList, {servername, serverip})
-                    index = index + 1
-                end
-                index = 1
-                for k,v in pairs(P.serverList) do
-                    local item = CEGUI.createListboxTextItem( v[1] .. ": " .. v[2] )
-                    item:setID(index)
-                    index = index + 1
-                    item:setSelectionBrushImage(menuImageSet, "MultiListSelectionBrush")
-                    CEGUI.toListbox(listbox):addItem(item)
-                end
-        -- WAN Discovery
-        elseif P.joinMode == 2 then
-                local listbox = winMgr:getWindow("orxonox/MultiplayerListbox")
-                CEGUI.toListbox(listbox):resetList()
-                local discovery = orxonox.WANDiscovery:getInstance()
-                cout(0, "discovering.\n" )
-                discovery:discover()
-                cout(0, "discovered.\n" )
-                P.serverList = {}
-                local index = 0
-                local servername = ""
-                local serverip = ""
-                while true do
-                    servername = discovery:getServerListItemName(index)
-                    if servername == "" then
-                        break
-                    end
-                    serverip = discovery:getServerListItemIP(index)
-                    if serverip == "" then
-                      break
-                    end
-                    table.insert(P.serverList, {servername, serverip})
-                    index = index + 1
-                end
-                index = 1
-                for k,v in pairs(P.serverList) do
-                    local item = CEGUI.createListboxTextItem( v[1] .. ": " .. v[2] )
-                    item:setID(index)
-                    index = index + 1
-                    item:setSelectionBrushImage(menuImageSet, "MultiListSelectionBrush")
-                    CEGUI.toListbox(listbox):addItem(item)
-                end
-        end
-        
-end
+    -- LAN Discovery
+    if P.joinMode == 1 then
+        local listbox = winMgr:getWindow("orxonox/MultiplayerListbox")
+        CEGUI.toListbox(listbox):resetList()
+        local discovery = orxonox.LANDiscovery:getInstance()
+        discovery:discover()
+        P.serverList = {}
+        local index = 0
+        local servername = ""
+        local serverip = ""
+        while true do
+            servername = discovery:getServerListItemName(index)
+            if servername == "" then
+                break
+            end
+            serverip = discovery:getServerListItemIP(index)
+            if serverip == "" then
+                break
+            end
+            table.insert(P.serverList, {servername, serverip})
+            index = index + 1
+        end
+        index = 1
+        for k,v in pairs(P.serverList) do
+            local item = CEGUI.createListboxTextItem( v[1] .. ": " .. v[2] )
+            item:setID(index)
+            index = index + 1
+            item:setSelectionBrushImage(menuImageSet, "MultiListSelectionBrush")
+            CEGUI.toListbox(listbox):addItem(item)
+        end
+    -- WAN Discovery
+    elseif P.joinMode == 2 then
+        local listbox = winMgr:getWindow("orxonox/MultiplayerListbox")
+        CEGUI.toListbox(listbox):resetList()
+        local discovery = orxonox.WANDiscovery:getInstance()
+        cout(0, "discovering.\n" )
+        discovery:discover()
+        cout(0, "discovered.\n" )
+        P.serverList = {}
+        local index = 0
+        local servername = ""
+        local serverip = ""
+        while true do
+            servername = discovery:getServerListItemName(index)
+            if servername == "" then
+                break
+            end
+            serverip = discovery:getServerListItemIP(index)
+            if serverip == "" then
+                break
+            end
+            table.insert(P.serverList, {servername, serverip})
+            index = index + 1
+        end
+        index = 1
+        for k,v in pairs(P.serverList) do
+            local item = CEGUI.createListboxTextItem( v[1] .. ": " .. v[2] )
+            item:setID(index)
+            index = index + 1
+            item:setSelectionBrushImage(menuImageSet, "MultiListSelectionBrush")
+            CEGUI.toListbox(listbox):addItem(item)
+        end
+    end
 
-function P.onKeyPressed() 
-    buttonIteratorHelper(P.buttonList, code, P, 2, 2)
 end