chat messages are now sent and relayed. server: handling host client leaving correctly
This commit is contained in:
@@ -8,6 +8,9 @@ extends Control
|
||||
@export var join_lobby_button: Button
|
||||
@export var leave_lobby_button: Button
|
||||
|
||||
@export var chat_message_input: LineEdit
|
||||
@export var send_chat_message_button: Button
|
||||
|
||||
@export var name_input: LineEdit
|
||||
@export var lobby_code_input: LineEdit
|
||||
|
||||
@@ -41,6 +44,12 @@ func _on_disconnect_lobby_button_pressed() -> void:
|
||||
leave_lobby_button.disabled = true
|
||||
client.leave_lobby()
|
||||
|
||||
func _on_send_message_button_pressed() -> void:
|
||||
var msg: String = chat_message_input.text.strip_edges()
|
||||
if not msg.is_empty():
|
||||
client.send_chat_message(msg)
|
||||
chat_message_input.text = ""
|
||||
|
||||
func _on_web_client_tcp_connected_to_server() -> void:
|
||||
create_lobby_button.disabled = false
|
||||
join_lobby_button.disabled = false
|
||||
@@ -73,6 +82,12 @@ func _on_web_client_tcp_client_joined_lobby(client_name: String) -> void:
|
||||
"you": " (that's you!)" if client_name == name_input.text.strip_edges() else ""
|
||||
}))
|
||||
|
||||
func _on_web_client_tcp_received_chat_message(client_name: String, message: String) -> void:
|
||||
_write_line("<{client_name}> {message}".format({
|
||||
"client_name": client_name,
|
||||
"message": message,
|
||||
}))
|
||||
|
||||
|
||||
func _on_web_client_tcp_connection_status_changed(new_status: WebClientTCP.ConnectionStatus) -> void:
|
||||
match new_status:
|
||||
@@ -84,6 +99,8 @@ func _on_web_client_tcp_connection_status_changed(new_status: WebClientTCP.Conne
|
||||
name_input.editable = true
|
||||
lobby_code_input.editable = false
|
||||
lobby_code_input.text = ""
|
||||
chat_message_input.editable = false
|
||||
send_chat_message_button.disabled = true
|
||||
|
||||
WebClientTCP.ConnectionStatus.ATTEMPTING_CONNECTION:
|
||||
connect_button.disabled = true
|
||||
@@ -93,6 +110,8 @@ func _on_web_client_tcp_connection_status_changed(new_status: WebClientTCP.Conne
|
||||
name_input.editable = true
|
||||
lobby_code_input.editable = false
|
||||
lobby_code_input.text = ""
|
||||
chat_message_input.editable = false
|
||||
send_chat_message_button.disabled = true
|
||||
|
||||
WebClientTCP.ConnectionStatus.LOBBYLESS:
|
||||
connect_button.disabled = true
|
||||
@@ -102,6 +121,8 @@ func _on_web_client_tcp_connection_status_changed(new_status: WebClientTCP.Conne
|
||||
name_input.editable = true
|
||||
lobby_code_input.editable = true
|
||||
lobby_code_input.text = ""
|
||||
chat_message_input.editable = false
|
||||
send_chat_message_button.disabled = true
|
||||
|
||||
WebClientTCP.ConnectionStatus.ATTEMPTING_JOIN:
|
||||
connect_button.disabled = true
|
||||
@@ -110,6 +131,8 @@ func _on_web_client_tcp_connection_status_changed(new_status: WebClientTCP.Conne
|
||||
leave_lobby_button.disabled = true
|
||||
name_input.editable = false
|
||||
lobby_code_input.editable = false
|
||||
chat_message_input.editable = false
|
||||
send_chat_message_button.disabled = true
|
||||
|
||||
WebClientTCP.ConnectionStatus.JOINED:
|
||||
connect_button.disabled = true
|
||||
@@ -118,3 +141,5 @@ func _on_web_client_tcp_connection_status_changed(new_status: WebClientTCP.Conne
|
||||
leave_lobby_button.disabled = false
|
||||
name_input.editable = false
|
||||
lobby_code_input.editable = false
|
||||
chat_message_input.editable = true
|
||||
send_chat_message_button.disabled = false
|
||||
|
||||
@@ -24,6 +24,8 @@ signal disconnected_from_lobby()
|
||||
|
||||
signal client_joined_lobby(client_name: String)
|
||||
|
||||
signal received_chat_message(client_name: String, message: String)
|
||||
|
||||
signal connection_status_changed(new_status: ConnectionStatus)
|
||||
|
||||
enum ConnectionStatus {
|
||||
@@ -86,8 +88,8 @@ func _handle_response(response: String) -> void:
|
||||
"leave_lobby":
|
||||
if data["status"] == "ok":
|
||||
print(data["client_id"] + " left")
|
||||
#if data["client_id"] == _client_id:
|
||||
#connection_status_changed.emit.call_deferred(ConnectionStatus.LOBBYLESS)
|
||||
"receive_chat_message":
|
||||
received_chat_message.emit.call_deferred(data["client_name"], data["message"])
|
||||
|
||||
func _exit_tree() -> void:
|
||||
disconnect_from_server()
|
||||
@@ -123,8 +125,11 @@ func leave_lobby() -> void:
|
||||
_client_id = ""
|
||||
_client_name = ""
|
||||
|
||||
disconnected_from_lobby.emit()
|
||||
connection_status_changed.emit(ConnectionStatus.LOBBYLESS)
|
||||
disconnected_from_lobby.emit.call_deferred()
|
||||
connection_status_changed.emit.call_deferred(ConnectionStatus.LOBBYLESS)
|
||||
|
||||
func send_chat_message(message: String) -> void:
|
||||
_send_message(TCPMessages.send_chat_message(_lobby_id, _client_id, message))
|
||||
|
||||
func _send_message(message: String) -> void:
|
||||
_tcp.put_data(message.to_utf8_buffer())
|
||||
|
||||
Reference in New Issue
Block a user