aboutsummaryrefslogtreecommitdiff
path: root/client/game.gd
diff options
context:
space:
mode:
Diffstat (limited to 'client/game.gd')
-rw-r--r--client/game.gd13
1 files changed, 7 insertions, 6 deletions
diff --git a/client/game.gd b/client/game.gd
index 13eedcda..d57099ed 100644
--- a/client/game.gd
+++ b/client/game.gd
@@ -78,10 +78,9 @@ var spectating_mode: SpectatingMode = SpectatingMode.CENTER
func _ready():
mp.packet.connect(handle_packet)
- mp.connection_closed.connect(func(reason: String):
- get_parent().replace_menu("res://gui/menus/error.tscn", [reason, menu.data])
- )
- mp.connect_to_url(menu.data)
+ mp.connection_closed.connect(func(reason: String): show_error(reason))
+ mp.connect_to_urls(menu.data)
+
text_message.connect(func(m):
text_message_history.push_back(m)
while text_message_history.size() > 64:
@@ -391,7 +390,7 @@ func handle_packet(p):
get_parent().replace_menu("res://gui/menus/game.tscn", p.uri[0])
"disconnect":
var m := MessageParser.new(p.reason, self)
- get_parent().replace_menu("res://gui/menus/error.tscn", [m.result, menu.data])
+ show_error(m.result)
"replay_start":
is_replay = true
"replay_stop":
@@ -404,6 +403,9 @@ func handle_packet(p):
pass # Only implemented in test client
_: push_warning("Unrecognized packet type: %s" % p.type)
+func show_error(message: String):
+ get_parent().replace_menu("res://gui/menus/error.tscn", [message, menu.data])
+
func system_message(s: String):
var message = TextMessage.new()
message.text = s
@@ -509,7 +511,6 @@ func spectate_center():
$Center.position = Vector3(map_center.x, 0.,map_center.y)
$FollowCamera.camera_distance_target = (extents[1] - extents[0]).length() / 2
-
func spectate_free():
var direction := Input.get_vector("left", "right", "forwards", "backwards")
direction = direction.rotated(-follow_camera.angle_target)