X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=game.js;h=0023257e796c1f56e49e2fe62742c6ec1f35454b;hb=d7b96ee0316021fa7a5e428950e2d8a9d8754582;hp=7ca150735269d0c0b6c4bc0681e70302d4a41813;hpb=443a21300369b2bfe01a6e62eaad91953541d9d8;p=lmno-server

diff --git a/game.js b/game.js
index 7ca1507..0023257 100644
--- a/game.js
+++ b/game.js
@@ -59,6 +59,7 @@ class Game {
     this.id = id;
     this.players = [];
     this.players_by_session = {};
+    this.active_players = 0;
     this.next_player_id = 1;
     this.teams = [];
     this.state = {
@@ -164,6 +165,14 @@ class Game {
     /* First see if we already have a player object for this session. */
     const existing = this.players_by_session[session.id];
     if (existing) {
+      if (! existing.active) {
+        /* If we're re-activating a previously idled player, then we
+         * need to alert everyone that this player is now back.
+         */
+        existing.active = true;
+        this.active_players++;
+        this.broadcast_event("player-enter", existing.info_json());
+      }
       existing.add_connection(connection);
       return existing;
     }
@@ -187,11 +196,11 @@ class Game {
 
     /* Broadcast before adding player to list (to avoid announcing the
      * new player to itself). */
-    const player_data = JSON.stringify({ id: player.id, name: player.name });
-    this.broadcast_event("player-enter", player_data);
+    this.broadcast_event("player-enter", player.info_json());
 
     this.players.push(player);
     this.players_by_session[session.id] = player;
+    this.active_players++;
     this.next_player_id++;
 
     /* After adding the player to the list, and if we are already past
@@ -216,6 +225,7 @@ class Game {
     const remaining = player.remove_connection(connection);
     if (remaining === 0) {
       player.active = false;
+      this.active_players--;
       const player_data = JSON.stringify({ id: player.id });
       this.broadcast_event("player-exit", player_data);
     }