diff --git a/parts/net.lua b/parts/net.lua index c3fff6d3..3976d506 100644 --- a/parts/net.lua +++ b/parts/net.lua @@ -6,9 +6,16 @@ local NET={ accessToken=false, } +local mesType={ + OK=true, + Connected=true, + Server=true, + Broadcast=true, +} + --Lock & Unlock submodule local locks={} -function NET.lock(name,T) +local function _lock(name,T) if locks[name]and TIME()=res.lowest then NET.allow_online=true @@ -202,7 +215,7 @@ function NET.TICK_WS_user() NET.wsCloseMessage(message) return else - local res=NET.parse(message) + local res=_parse(message) if res then if res.message=="Connected"then NET.login=true @@ -220,7 +233,7 @@ function NET.TICK_WS_user() NET.accessToken=res.accessToken LOG.print(text.accessSuccessed) NET.wsConnectPlay() - NET.unlock("accessToken") + _unlock("accessToken") elseif res.action==1 then--Get userInfo NET.storeUserInfo(res) end @@ -246,16 +259,16 @@ function NET.TICK_WS_play() NET.wsCloseMessage(message) return else - local res=NET.parse(message) + local res=_parse(message) if res then if res.message=="Connected"then - NET.unlock("connectPlay") + _unlock("connectPlay") SCN.go("net_menu") elseif res.action==0 then--Fetch rooms NET.roomList=res.roomList elseif res.action==2 then--Join(create) room -- loadGame("netBattle",true,true) - NET.unlock("enterRoom") + _unlock("enterRoom") elseif res.action==3 then--Leave room SCN.back() end @@ -301,7 +314,7 @@ function NET.TICK_WS_chat() NET.wsCloseMessage(message) return else - local res=NET.parse(message) + local res=_parse(message) if res then --TODO else