Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
May 27, 2015, 10:45:56 AM (10 years ago)
Author:
maxima
Message:

multiplayer branch merged to presentation

File:
1 edited

Legend:

Unmodified
Added
Removed

  • code/branches/presentationFS15/data/gui/scripts/MultiplayerMenu.lua

    r8858 r10497  
    7070    if choice then
    7171        local index = tolua.cast(choice, "CEGUI::ListboxItem"):getID()
    72         destination = P.serverList[index][2]
     72        destination = P.serverList[index][1]
    7373    else
    7474        return
    … …  
    9393        local servername = ""
    9494        local serverip = ""
     95        local serverrtt = ""
     96        local playernumber = ""
    9597        while true do
    9698            servername = discovery:getServerListItemName(index)
    … …  
    102104                break
    103105            end
    104             table.insert(P.serverList, {servername, serverip})
     106            --serverrtt = discovery:getServerListItemRTT(index)
     107            playernumber = discovery:getServerListItemPlayerNumber(index)
     108
     109            table.insert(P.serverList, {serverip, servername, playernumber})
    105110            index = index + 1
    106111        end
    107112        index = 1
    108113        for k,v in pairs(P.serverList) do
    109             local item = CEGUI.createListboxTextItem( v[1] .. ": " .. v[2] )
     114            local item = CEGUI.createListboxTextItem("IP: " .. v[1] .. " Name: " .. v[2] .. " Players: " .. v[3])
    110115            item:setID(index)
    111116            index = index + 1
    … …  
    125130        local servername = ""
    126131        local serverip = ""
     132        local serverrtt = ""
     133        local playernumber = ""
    127134        while true do
    128135            servername = discovery:getServerListItemName(index)
    … …  
    134141                break
    135142            end
    136             table.insert(P.serverList, {servername, serverip})
     143            --serverrtt = discovery:getServerListItemRTT(index)
     144            playernumber = discovery:getServerListItemPlayerNumber(index)
     145
     146            table.insert(P.serverList, {serverip, servername, playernumber})
    137147            index = index + 1
    138148        end
    139149        index = 1
    140150        for k,v in pairs(P.serverList) do
    141             local item = CEGUI.createListboxTextItem( v[1] .. ": " .. v[2] )
     151            local item = CEGUI.createListboxTextItem("IP: " .. v[1] .. " Name: " .. v[2] .. " Players: " .. v[3])
    142152            item:setID(index)
    143153            index = index + 1
    … …  
    150160
    151161return P
    152 
Note: See TracChangeset for help on using the changeset viewer.