Changeset 321fbbc in network-game

Timestamp:

Sep 26, 2013, 5:41:56 PM (11 years ago)

Author:

Dmitry Portnoy <dportnoy@…>

Branches:

master

Children:

b92e6a7

Parents:

2992b1a

Message:

Client only stores the game name and number of players of each game

Files:

• client/Client/main.cpp (modified) (3 diffs)
• common/Game.cpp (modified) (1 diff)
• common/Game.h (modified) (1 diff)

client/Client/main.cpp

@@ -119 +119 @@
 chat chatConsole, debugConsole;
 bool debugging;
-map<string, Game> mapGames;
+map<string, int> mapGames;
 
 MessageProcessor msgProcessor;
@@ -452 +452 @@
 
          if (wndCurrent == wndLobby) {
-            map<string, Game>::iterator it;
+            map<string, int>::iterator it;
             int i=0;
             ostringstream ossGame;
             for (it = mapGames.begin(); it != mapGames.end(); it++) {
-               ossGame << it->first << " (" << it->second.getNumPlayers() << " players)" << endl;
+               ossGame << it->first << " (" << it->second << " players)" << endl;
                al_draw_text(font, al_map_rgb(0, 255, 0), SCREEN_W*1/4-100, 120+i*15, ALLEGRO_ALIGN_LEFT, ossGame.str().c_str());
                ossGame.clear();
@@ -836 +836 @@
                cout << "Received game info for " << gameName << " (num players: " << numPlayers << ")" << endl;
                
-               if (mapGames.find(gameName) == mapGames.end())
-                  mapGames[gameName] = Game(gameName);
-               mapGames[gameName].setNumPlayers(numPlayers);
+               mapGames[gameName] = numPlayers;
 
                break;

common/Game.cpp

@@ -24 +24 @@
 }
 
-void Game::setNumPlayers(int numPlayers) {
-   int numCurPlayers = this->getNumPlayers();
-   int numNewPlayers = numPlayers-numCurPlayers;
-
-   for (int i=0; i<numNewPlayers; i++)
-      this->players[numCurPlayers+i] = NULL;
-}
-
 bool Game::addPlayer(Player* p) {
    if (players.count(p->id) == 0) {

common/Game.h

@@ -33 +33 @@
 
    void setId(int id);
-   void setNumPlayers(int numPlayers);
    bool addPlayer(Player* p);
    bool removePlayer(int id);