diff options
Diffstat (limited to 'client/game.gd')
| -rw-r--r-- | client/game.gd | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/client/game.gd b/client/game.gd index de1024ed..8cd648a6 100644 --- a/client/game.gd +++ b/client/game.gd @@ -211,7 +211,9 @@ func handle_packet(p): players[p.player].effect_message(p.name) "set_ingame": in_lobby = p.lobby - in_lobby_updated.emit(in_lobby) + overlay.set_ingame(p.state, p.lobby) + follow_camera.set_ingame(p.state, p.lobby) + if p.state: map.gi_bake() await get_parent()._menu_open() @@ -227,8 +229,7 @@ func handle_packet(p): if lobby and not join_sent: join() - overlay.set_ingame(p.state, p.lobby) - follow_camera.set_ingame(p.state, p.lobby) + in_lobby_updated.emit(in_lobby) "score": if p.time_remaining != null: overlay.update(p.demands_failed, p.demands_completed, p.points, p.time_remaining) @@ -262,8 +263,8 @@ func handle_packet(p): "server_message": var mstr := get_message_str(p.message) if p.error: - popup_message.display_server_msg(tr("c.error.server") % mstr) - push_error(tr("c.error.server") % mstr) + popup_message.display_server_msg(tr("c.error.server").format([mstr])) + push_error(tr("c.error.server").format([mstr])) else: popup_message.display_server_msg(mstr) "server_hint": @@ -307,7 +308,7 @@ func _process(delta): func get_message_str(m: Dictionary) -> String: if "text" in m: return m.text - if "translation" in m: return tr(m.translation.id) % m.translation.params.map(get_message_str) + if "translation" in m: return tr(m.translation.id).format(m.translation.params.map(get_message_str)) if "tile" in m: return tile_names[m.tile] if "item" in m: return item_names[m.item] return "[unknown message type]" |