Changeset 3d6f78f in network-game

Timestamp:

Dec 17, 2013, 12:46:17 AM (11 years ago)

Author:

dportnoy <dmp1488@…>

Branches:

master

Children:

1248984

Parents:

b4c5b6a

Message:

Comments and design doc changes

Files:

• design/multipleGameDesign.txt (modified) (1 diff)
• server/server.cpp (modified) (1 diff)

design/multipleGameDesign.txt

@@ -6 +6 @@
 
 There should be a new LOBBY state the player goes to after logging in, which lets him create a game and view all created games. There should also be a button to let him go to the current "global" game.
+
+The client only has one game object, which is the game the client is currently in (or MILL if the client is in the lobby). The mapGames of the client maps game names to number of players in each game.

server/server.cpp

@@ -1095 +1095 @@
          Player* p = findPlayerByAddr(mapPlayers, from);
          p->team = rand() % 2; // choose a random team (either 0 or 1)
-         p->currentGame = g;
+         p->currentGame = g; // should have been done in JOIN_GAME, so not necessary
 
          map<unsigned int, Player*>& otherPlayers = g->getPlayers();