From 8461de5a604d7fede00855632c55b5ec59779d0f Mon Sep 17 00:00:00 2001 From: tpart Date: Wed, 18 Sep 2024 18:10:21 +0200 Subject: Implement new server message packet; Remove old server error packet; Bump protocol version to 7.0 --- client/multiplayer.gd | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'client/multiplayer.gd') diff --git a/client/multiplayer.gd b/client/multiplayer.gd index 1a261b99..64b23b5f 100644 --- a/client/multiplayer.gd +++ b/client/multiplayer.gd @@ -52,13 +52,13 @@ signal set_player_finished(player: int, warn: bool) signal set_ingame(state: bool, lobby: bool) signal score(demands_failed: int, demands_completed: int, points: int, time_remaining: float) signal environment(params: Dictionary) -signal server_message(text: String) +signal server_message(message: Dictionary, error: bool) signal replay_start() signal connection_closed(reason: String) signal show_rating(stars: int, points: int) signal show_book() -const VERSION_MAJOR: int = 6 +const VERSION_MAJOR: int = 7 const VERSION_MINOR: int = 0 var connected := false @@ -217,9 +217,6 @@ func handle_packet(bytes: PackedByteArray): var state = decoded["state"] var lobby = decoded["lobby"] set_ingame.emit(state, lobby) - "error": - var message = decoded["message"] - push_warning("server error: %s" % message) "score": var demands_failed: int = decoded["demands_failed"] var demands_completed: int = decoded["demands_completed"] @@ -238,8 +235,9 @@ func handle_packet(bytes: PackedByteArray): var points = d["points"] show_rating.emit(stars, points) "server_message": - var text = decoded["text"] - server_message.emit(text) + var message: Dictionary = decoded["message"] + var error: bool = decoded["error"] + server_message.emit(message, error) "environment": environment.emit(decoded["effects"]) "replay_start": replay_start.emit() -- cgit v1.2.3-70-g09d2