j4nk
/
open-card-table
1
0
Fork 0
Code Issues 7 Pull Requests Projects Releases Wiki Activity

Fixed some bugs in lobby ui

This commit is contained in:
j4nk 2025-03-22 22:38:39 -04:00
parent 5ee6510748
commit 21cf5bca4c
2 changed files with 30 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
lobby.lua
View File

@ -89,6 +89,20 @@ client_connect_ip = nil
client_connect_port = nil client_connect_port = nil
client_connect_name = nil client_connect_name = nil
function lobby_clear_connect_form()
lobby_ip_textbox["sprite"]["x"] = 1000
lobby_port_textbox["sprite"]["x"] = 1000
lobby_name_textbox["sprite"]["x"] = 1000
lobby_connect_message["x"] = 1000
lobby_ip_textbox["sprite"]["y"] = 1000
lobby_port_textbox["sprite"]["y"] = 1000
lobby_name_textbox["sprite"]["y"] = 1000
lobby_connect_message["y"] = 1000
unregister_textbox(lobby_ip_textbox)
unregister_textbox(lobby_port_textbox)
unregister_textbox(lobby_name_textbox)
end
--function lobby_client(ip, port, name, my_port) --function lobby_client(ip, port, name, my_port)
function lobby_client(key, ch, my_port) function lobby_client(key, ch, my_port)
if (lobby_first_call) if (lobby_first_call)
@ -133,7 +147,7 @@ function lobby_client(key, ch, my_port)
end end
-- If not already connected, connect sending info -- If not already connected, connect sending info
if (not client_connected and client_wait_for_reg_response == false and not client_filling_in_connect_form) then if (not client_connected and not client_wait_for_reg_response and not client_filling_in_connect_form) then
msg_to_server = json.encode({ msg_to_server = json.encode({
{ name = client_connect_name, msg_type=OCT_LOBBY_MSG_CLIENTREG, port=my_port } { name = client_connect_name, msg_type=OCT_LOBBY_MSG_CLIENTREG, port=my_port }
}) })
@ -152,8 +166,10 @@ function lobby_client(key, ch, my_port)
OCT_LOG_INFO("Server accepted registration request!") OCT_LOG_INFO("Server accepted registration request!")
lobby_connect_message["shape"] = "Connected" lobby_connect_message["shape"] = "Connected"
lobby_connect_message["fg"] = TB_GREEN lobby_connect_message["fg"] = TB_GREEN
client_connected = 1 client_connected = true
client_wait_for_reg_response = false client_wait_for_reg_response = false
client_filling_in_connect_form = false
lobby_clear_connect_form()
-- Registration was unsuccessful -- Registration was unsuccessful
elseif (client_wait_for_reg_response == true and elseif (client_wait_for_reg_response == true and
@ -161,8 +177,9 @@ function lobby_client(key, ch, my_port)
OCT_LOG_ERROR("Server rejected registration request, try using a different name") OCT_LOG_ERROR("Server rejected registration request, try using a different name")
lobby_connect_message["shape"] = "Server rejected request, try changing name or port" lobby_connect_message["shape"] = "Server rejected request, try changing name or port"
lobby_connect_message["fg"] = TB_RED lobby_connect_message["fg"] = TB_RED
client_connected = 0 client_connected = false
client_wait_for_reg_response = false client_wait_for_reg_response = false
client_filling_in_connect_form = true
-- We received a clientlist from the server -- We received a clientlist from the server
elseif (msg_obj["msg_type"] == OCT_LOBBY_MSG_CLIENTLIST) then elseif (msg_obj["msg_type"] == OCT_LOBBY_MSG_CLIENTLIST) then

17
ui.lua
View File

@ -26,13 +26,16 @@ function create_textbox(id, pos_x, pos_y, max_length, label)
end end
function update_registered_textboxes_appearance() function update_registered_textboxes_appearance()
-- textbox at front is focused, set to green if (registered_textboxes[1])
registered_textboxes[1]["sprite"]["fg"] = TB_GREEN then
-- set all other textboxes to unfocused (white colored) -- textbox at front is focused, set to green
for i=2,#registered_textboxes registered_textboxes[1]["sprite"]["fg"] = TB_GREEN
do -- set all other textboxes to unfocused (white colored)
registered_textboxes[i]["sprite"]["fg"] = TB_WHITE for i=2,#registered_textboxes
end do
registered_textboxes[i]["sprite"]["fg"] = TB_WHITE
end
end
end end
function register_textbox(textbox) function register_textbox(textbox)