add player selectionHEADmain

1 files changed, 17 insertions, 15 deletions

diff --git a/client.lua b/client.lua
index 3c6cd63..1bf4952 100644
--- a/client.lua
+++ b/client.lua
@@ -29,7 +29,7 @@ function client.join(invite, match_addr)
 
     local clt = create_client(secret)
     clt.match = clt.host:connect(match_addr or common.default_match_addr)
-    clt.match:send(util.json_enc({ type = "match_join", game_id = game_id }))
+    util.send(clt.match, { type = "match_join", game_id = game_id })
     clt.match_req = socket.gettime()
     clt.game_id = game_id
     clt.status = "wait_match"
@@ -59,6 +59,12 @@ local function handle_server(clt, pkt)
         clt.status = "active"
     elseif pkt.type == "client_reject" then
         clt.status = "fail_server"
+    elseif pkt.type == "client_info" then
+        clt.info = pkt
+    elseif pkt.type == "client_player" then
+        clt.player = pkt.name
+    elseif pkt.type == "client_player_fail" then
+        clt.player_error = pkt.error
     end
 end
 
@@ -78,9 +84,9 @@ function client.update(clt)
             end
         elseif event.type == "connect" then
             if event.peer == clt.match and clt.status == "wait_match" then
-                clt.match:send(util.json_enc({ type = "match_join", game_id = util.base64_enc(clt.game_id) }))
+                util.send(clt.match, { type = "match_join", game_id = util.base64_enc(clt.game_id) })
             elseif event.peer == clt.server and clt.status == "wait_server" then
-                clt.server:send(util.json_enc({ type = "server_hi", secret = util.base64_enc(clt.secret) }))
+                util.send(clt.server, { type = "server_hi", secret = util.base64_enc(clt.secret) })
             else
                 event.peer:disconnect_now()
             end
@@ -103,24 +109,20 @@ function client.status(clt)
     end
 
     return clt.status
+end
 
-
-    -- wait_match
-    -- wait_server
-
-    -- timeout_match
-    -- fail_match
-    -- timeout_server
-    -- fail_server
-
-    -- active
-    -- disco
+function client.select_player(clt, name, create)
+    util.send(clt.server, {
+        type = "server_player",
+        name = name,
+        create = create,
+    })
 end
 
 function client.close(clt)
     if clt.match then clt.match:disconnect() end
     if clt.server then clt.server:disconnect() end
-    clt.host:service()
+    clt.host:flush()
     clt.host:destroy()
 end