X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=lmno.js;h=baa96f82a5469d66ccd51916005182e4361e0c74;hb=041cdbd90052345df5a05779ada61aec53e403d4;hp=60c0f44000dfa702ec04c4b9cddbbb6d9600a40f;hpb=0cc61b68f175ae13fe2390d8e5c6bf374153aecc;p=empires-server

diff --git a/lmno.js b/lmno.js
index 60c0f44..baa96f8 100644
--- a/lmno.js
+++ b/lmno.js
@@ -69,6 +69,8 @@ nunjucks.configure("templates", {
  *
  *                 /        Serves <identifier>-game.html template
  *
+ *                 /player  Allows client to set name or team
+ *
  *                 /events  Serves a stream of events. Game can override
  *                          the handle_events method, call super() first,
  *                          and then have code to add custom events.
@@ -289,6 +291,12 @@ for (let key in engines) {
       response.render(`${game.meta.identifier}-game.html`);
   });
 
+  router.put('/player', (request, response) => {
+    const game = request.game;
+
+    game.handle_player(request, response);
+  });
+
   router.get('/events', (request, response) => {
     const game = request.game;
 
@@ -297,18 +305,30 @@ 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[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 legal = game.add_move(move);
+      const result = game.add_move(player, move);
 
-      /* Inform this client whether the move was legal. */
-      response.send(JSON.stringify(legal));
+      /* Feed move response back to the client. */
+      response.json(result);
 
       /* And only if legal, inform all clients. */
-      if (! legal)
+      if (! result.legal)
         return;
 
       game.broadcast_move(move);