2 files changed, 14 insertions, 6 deletions
diff --git a/test-client/main.ts b/test-client/main.ts
index f48aef17..9ec4ac5e 100644
--- a/test-client/main.ts
+++ b/test-client/main.ts
@@ -62,7 +62,8 @@ document.addEventListener("DOMContentLoaded", async () => {
     document.addEventListener("keydown", ev => keyboard(ev, true))
     document.addEventListener("keyup", ev => keyboard(ev, false))
     document.addEventListener("contextmenu", ev => ev.preventDefault())
-    setInterval(tick_update, 1000 / 25);
+    const tick_int = setInterval(tick_update, 1000 / 25);
+    ws.addEventListener("close", () => clearInterval(tick_int))
 })
 
 export interface ItemData {
@@ -121,6 +122,7 @@ export const interact_target_anim: V2 = { x: 0, y: 0 }
 export let interact_possible_anim: number = 0
 export let interact_active_anim: number = 0
 export let nametag_scale_anim: number = 0
+export let is_lobby = false
 let interacting: V2 | undefined;
 let last_server_sent_position: V2 = { x: 0, y: 0 }
 
@@ -244,6 +246,7 @@ function packet(p: PacketC) {
             break;
         case "set_ingame":
             console.log(`ingame ${p.state}`);
+            is_lobby = p.lobby
             break;
         case "movement_sync":
             players.get(my_id)!.position = last_server_sent_position
diff --git a/test-client/visual.ts b/test-client/visual.ts
index 863fea41..f25be1ef 100644
--- a/test-client/visual.ts
+++ b/test-client/visual.ts
@@ -16,7 +16,7 @@
 
 */
 import { tr } from "./locale.ts";
-import { ItemData, MessageData, PlayerData, TileData, camera, camera_scale, canvas, ctx, data, demands_completed, demands_failed, get_interact_target, global_message, interact_active_anim, interact_possible_anim, interact_target_anim, items_removed, keys_down, my_id, nametag_scale_anim, players, points, server_hints, tiles, time_remaining } from "./main.ts";
+import { ItemData, MessageData, PlayerData, TileData, camera, camera_scale, canvas, ctx, data, demands_completed, demands_failed, get_interact_target, global_message, interact_active_anim, interact_possible_anim, interact_target_anim, is_lobby, items_removed, keys_down, my_id, nametag_scale_anim, players, points, server_hints, tiles, time_remaining } from "./main.ts";
 import { PLAYER_SIZE } from "./movement.ts";
 import { draw_item_sprite, draw_tile_sprite, ItemName, TileName } from "./tiles.ts";
 import { V2, ceil_v2, floor_v2 } from "./util.ts";
@@ -87,6 +87,15 @@ export function draw_ingame() {
 
     draw_global_message()
 
+    if (!is_lobby)
+        draw_score()
+
+    if (keys_down.has("KeyP")) {
+        draw_debug()
+    }
+}
+
+function draw_score() {
     ctx.fillStyle = "white"
     ctx.textAlign = "left"
     ctx.textBaseline = "bottom"
@@ -98,10 +107,6 @@ export function draw_ingame() {
     ctx.font = "20px sans-serif"
     ctx.fillText(`${tr("c.score.completed")}: ${demands_completed}`, 10, canvas.height - 30)
     ctx.fillText(`${tr("c.score.failed")}: ${demands_failed}`, 10, canvas.height - 10)
-
-    if (keys_down.has("KeyP")) {
-        draw_debug()
-    }
 }
 
 function draw_debug() {