aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortpart <tpart120@proton.me>2024-09-28 20:13:57 +0200
committertpart <tpart120@proton.me>2024-09-28 20:13:57 +0200
commitc31d9c453d1f6a0d5537457ae29f5c5937eace67 (patch)
treeb2abc3435b6ae712e0ca672c3a6437bdca8e3dd2
parentd69b3a74daecf667a3e4d4bd670d29db1d3bf357 (diff)
downloadhurrycurry-c31d9c453d1f6a0d5537457ae29f5c5937eace67.tar
hurrycurry-c31d9c453d1f6a0d5537457ae29f5c5937eace67.tar.bz2
hurrycurry-c31d9c453d1f6a0d5537457ae29f5c5937eace67.tar.zst
Fix server message not disappearing
-rw-r--r--client/menu/communicate/popup_message/popup_message.gd6
-rw-r--r--client/menu/communicate/popup_message/popup_message.tscn2
2 files changed, 4 insertions, 4 deletions
diff --git a/client/menu/communicate/popup_message/popup_message.gd b/client/menu/communicate/popup_message/popup_message.gd
index d7dde91f..5977db55 100644
--- a/client/menu/communicate/popup_message/popup_message.gd
+++ b/client/menu/communicate/popup_message/popup_message.gd
@@ -90,6 +90,9 @@ func display_server_msg(msg: String, auto_remove := true):
if auto_remove:
server_msg_timer.start()
+func _on_server_timeout() -> void:
+ clear_server_msg()
+
func display_server_msg_positional(text: String, pos: Vector2):
var msg := PositionalMessage.new()
msg.node = SERVER_MESSAGE_SCENE.instantiate()
@@ -111,9 +114,6 @@ func clear_server_msg(position_ = null):
msg.node_2d.queue_free()
positional_messages.erase(position_)
-func _on_server_timer_timeout():
- clear_server_msg()
-
func display_hint_msg(msg: String):
hint_msg.show()
hint_msg_label.text = msg
diff --git a/client/menu/communicate/popup_message/popup_message.tscn b/client/menu/communicate/popup_message/popup_message.tscn
index 7342fcef..880e8670 100644
--- a/client/menu/communicate/popup_message/popup_message.tscn
+++ b/client/menu/communicate/popup_message/popup_message.tscn
@@ -152,7 +152,7 @@ one_shot = true
wait_time = 5.0
one_shot = true
-[connection signal="timeout" from="Timers/Server" to="Static" method="_on_server_timer_timeout"]
+[connection signal="timeout" from="Timers/Server" to="." method="_on_server_timeout"]
[connection signal="timeout" from="Timers/Hint" to="Static" method="_on_hint_timer_timeout"]
[connection signal="timeout" from="Timers/AutoHints/Move" to="Static" method="_on_move_timeout"]
[connection signal="timeout" from="Timers/AutoHints/Performance" to="Static" method="_on_performance_timeout"]