[Orxonox-commit 5786] r10446 - code/branches/multiplayerFS15/data/gui/scripts

[frovelli at orxonox.net]

Author: frovelli
Date: 2015-05-21 13:19:28 +0200 (Thu, 21 May 2015)
New Revision: 10446

Modified:
   code/branches/multiplayerFS15/data/gui/scripts/MultiplayerMenu.lua
Log:
Display bugfix

Modified: code/branches/multiplayerFS15/data/gui/scripts/MultiplayerMenu.lua
===================================================================
--- code/branches/multiplayerFS15/data/gui/scripts/MultiplayerMenu.lua	2015-05-21 10:57:18 UTC (rev 10445)
+++ code/branches/multiplayerFS15/data/gui/scripts/MultiplayerMenu.lua	2015-05-21 11:19:28 UTC (rev 10446)
@@ -69,7 +69,7 @@
     local destination = nil
     if choice then
         local index = tolua.cast(choice, "CEGUI::ListboxItem"):getID()
-        destination = P.serverList[index][2]
+        destination = P.serverList[index][1]
     else
         return
     end
@@ -93,6 +93,7 @@
         local servername = ""
         local serverip = ""
         local serverrtt = ""
+        local playernumber = ""
         while true do
             servername = discovery:getServerListItemName(index)
             if servername == "" then
@@ -102,14 +103,15 @@
             if serverip == "" then
                 break
             end
-            serverrtt = discovery:getServerListItemRTT(index)
+            --serverrtt = discovery:getServerListItemRTT(index)
+            playernumber = discovery:getServerListItemPlayerNumber(index)
 
-            table.insert(P.serverList, {servername, serverip, serverrtt})
+            table.insert(P.serverList, {serverip, servername, playernumber})
             index = index + 1
         end
         index = 1
         for k,v in pairs(P.serverList) do
-            local item = CEGUI.createListboxTextItem( v[1] .. ": " .. v[2] .. " Ping: " .. v[3] .."ms" )
+            local item = CEGUI.createListboxTextItem("IP: " .. v[1] .. " Name: " .. v[2] .. " Players: " .. v[3])
             item:setID(index)
             index = index + 1
             item:setSelectionBrushImage(menuImageSet, "MultiListSelectionBrush")
@@ -128,6 +130,7 @@
         local servername = ""
         local serverip = ""
         local serverrtt = ""
+        local playernumber = ""
         while true do
             servername = discovery:getServerListItemName(index)
             if servername == "" then
@@ -137,14 +140,15 @@
             if serverip == "" then
                 break
             end
-            serverrtt = discovery:getServerListItemRTT(index)
+            --serverrtt = discovery:getServerListItemRTT(index)
+            playernumber = discovery:getServerListItemPlayerNumber(index)
 
-            table.insert(P.serverList, {servername, serverip, serverrtt})
+            table.insert(P.serverList, {serverip, servername, playernumber})
             index = index + 1
         end
         index = 1
         for k,v in pairs(P.serverList) do
-            local item = CEGUI.createListboxTextItem( v[1] .. ": " .. v[2] .. " Ping: " .. v[3] .."ms" )
+            local item = CEGUI.createListboxTextItem("IP: " .. v[1] .. " Name: " .. v[2] .. " Players: " .. v[3])
             item:setID(index)
             index = index + 1
             item:setSelectionBrushImage(menuImageSet, "MultiListSelectionBrush")