X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=lmno.js;h=5e67350992497abacf41247720d0b304fc8cab8e;hb=9e5bf65868eaafcb11d09c0fee02e0d3d7c2121f;hp=5f5b2c7248db82fbd289002033bbd4c8cc24b05b;hpb=2fb7ba00b458f94dff3e924b245c8f02dc20525a;p=empires-server

diff --git a/lmno.js b/lmno.js
index 5f5b2c7..5e67350 100644
--- a/lmno.js
+++ b/lmno.js
@@ -70,11 +70,9 @@ class LMNO {
 
     const game = new engine.Game(id);
 
-    this.games[id] = {
-      game: game
-    };
+    this.games[id] = game;
 
-    return id;
+    return game;
   }
 }
 
@@ -110,8 +108,8 @@ function lmno_canonize(id) {
 
 app.post('/new/:game_engine', (request, response) =>  {
   const game_engine = request.params.game_engine;
-  const game_id = lmno.create_game(game_engine);
-  response.send(JSON.stringify(game_id));
+  const game = lmno.create_game(game_engine);
+  response.send(JSON.stringify(game.id));
 });
 
 /* Redirect any requests to a game ID at the top-level.
@@ -135,7 +133,7 @@ app.get('/[a-zA-Z0-9]{4}', (request, response) => {
       response.sendStatus(404);
       return;
   }
-  response.redirect(301, `/${game.game.meta.identifier}/${game.game.id}/`);
+  response.redirect(301, `/${game.meta.identifier}/${game.id}/`);
 });
 
 /* LMNO middleware to lookup the game. */
@@ -165,7 +163,7 @@ app.use('/:engine([^/]+)/:game_id([a-zA-Z0-9]{4})', (request, response, next) =>
   }
 
   /* Stash the game onto the request to be used by the game-specific code. */
-  request.game = game.game;
+  request.game = game;
   next();
 });
 
@@ -237,7 +235,7 @@ app.get('/admin/', auth_admin, (request, response) => {
   let idle = [];
 
   for (let id in lmno.games) {
-    if (lmno.games[id].game.clients.length)
+    if (lmno.games[id].clients.length)
       active.push(lmno.games[id]);
     else
       idle.push(lmno.games[id]);
@@ -260,6 +258,12 @@ for (let key in engines) {
       response.render(`${game.meta.identifier}-game.html`);
   });
 
+  engine.router.get('/events', (request, response) => {
+    const game = request.game;
+
+    game.handle_events(request, response);
+  });
+
   /* And mount the whole router at the path for the game. */
   app.use(`/${engine.Game.meta.identifier}/[a-zA-Z0-9]{4}/`, engine.router);
 }