empires: Rename add_player to register_player

[empires-server] / lmno.js

diff --git a/lmno.js b/lmno.js
index 1e1d260954d9fa7b71babdadea911fd63162c96e..db0d35b9cc3a55fef821f1b1d2f75a5c9aee868d 100644 (file)
--- a/lmno.js
+++ b/lmno.js
@@ -69,7 +69,7 @@ nunjucks.configure("templates", {
  *
  *                 /        Serves <identifier>-game.html template
  *
- *                 /player  Allows client to set name
+ *                 /player  Allows client to set name or team
  *
  *                 /events  Serves a stream of events. Game can override
  *                          the handle_events method, call super() first,
@@ -267,7 +267,7 @@ app.get('/admin/', auth_admin, (request, response) => {
   let idle = [];
 
   for (let id in lmno.games) {
-    if (lmno.games[id].clients.length)
+    if (lmno.games[id].players.length)
       active.push(lmno.games[id]);
     else
       idle.push(lmno.games[id]);
@@ -305,12 +305,27 @@ for (let key in engines) {
 
   /* Further, add some routes conditionally depending on whether the
    * engine provides specific, necessary methods for the routes. */
-  if (engine.prototype.add_move) {
+
+  /* Note: We have to use hasOwnProperty here since the base Game
+   * class has a geeric add_move function, and we don't want that to
+   * have any influence on our decision. Only if the child has
+   * overridden that do we want to create a "/move" route. */
+  if (engine.prototype.hasOwnProperty("add_move")) {
     router.post('/move', (request, response) => {
       const game = request.game;
       const move = request.body.move;
+      const player = game.players_by_session[request.session.id];
+
+      /* Reject move if there is no player for this session. */
+      if (! player) {
+        response.json({legal: false, message: "No valid player from session"});
+        return;
+      }
+
+      const result = game.add_move(player, move);
 
-      const result = game.add_move(move);
+      /* Take care of any generic post-move work. */
+      game.post_move(player, result);
 
       /* Feed move response back to the client. */
       response.json(result);