Switch team property from being a string to being an object

[empires-server] / lmno.js

diff --git a/lmno.js b/lmno.js
index 5d4ca3e7b554025a2b367cf8aca6dae71945ec1b..b85041ec74d13be48abcbca9a5f7e3e8b900ba4e 100644 (file)
--- a/lmno.js
+++ b/lmno.js
@@ -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);