X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=lmno.js;h=9998c734a2dc63b8f0f0943a928a1d76c73e4102;hb=bceb4cb3eb1b150aedc562978df01cb0ac4ce628;hp=0fd491a6293bf01672ba7d896ecea16689ce89b5;hpb=48026578b36151fdb09186f4fd5166db6c67c09a;p=empires-server diff --git a/lmno.js b/lmno.js index 0fd491a..9998c73 100644 --- a/lmno.js +++ b/lmno.js @@ -70,12 +70,9 @@ class LMNO { const game = new engine.Game(id); - this.games[id] = { - id: id, - game: game - }; + this.games[id] = game; - return id; + return game; } } @@ -111,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. @@ -136,7 +133,7 @@ app.get('/[a-zA-Z0-9]{4}', (request, response) => { response.sendStatus(404); return; } - response.redirect(301, `/${game.game.meta.identifier}/${game.id}/`); + response.redirect(301, `/${game.meta.identifier}/${game.id}/`); }); /* LMNO middleware to lookup the game. */ @@ -166,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(); }); @@ -238,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]);