Changeset b4c5b6a in network-game

Timestamp:

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

Author:

dportnoy <dmp1488@…>

Branches:

master

Children:

3d6f78f

Parents:

1a47469

Message:

PLAYER messages are handled in the NEW_GAME state and players are added to the client's Game instance

Location:

client/Client

Files:

• GameRender.cpp (modified) (1 diff)
• main.cpp (modified) (4 diffs)

client/Client/GameRender.cpp

@@ -63 +63 @@
    ALLEGRO_COLOR color;
 
-   for(it = mapPlayers.begin(); it != mapPlayers.end(); it++)
+   for (it = mapPlayers.begin(); it != mapPlayers.end(); it++)
    {
       p = it->second;

client/Client/main.cpp

@@ -472 +472 @@
             for (it = mapGames.begin(); it != mapGames.end(); it++) {
                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());
+               al_draw_text(font, al_map_rgb(0, 255, 0), SCREEN_W*1/2-100, 120+i*15, ALLEGRO_ALIGN_LEFT, ossGame.str().c_str());
                ossGame.clear();
                ossGame.str("");
@@ -480 +480 @@
          else if (wndCurrent == wndNewGame)
          {
+            al_draw_text(font, al_map_rgb(0, 255, 0), 4, 4, ALLEGRO_ALIGN_LEFT, "Players");
+
+            map<unsigned int, Player*>& gamePlayers = game->getPlayers();
+            map<unsigned int, Player*>::iterator it;
+
+            int playerCount = 0;
+            for (it = gamePlayers.begin(); it != gamePlayers.end(); it++)
+            {
+               al_draw_text(font, al_map_rgb(0, 255, 0), 4, 19+(playerCount+1)*15, ALLEGRO_ALIGN_LEFT, it->second->name.c_str());
+               playerCount++;
+            }
+
             ostringstream ossScoreBlue, ossScoreRed;
 
@@ -876 +888 @@
                string gameName(msg.buffer);         
                game = new Game(gameName, "../../data/map.txt");
+               game->addPlayer(mapPlayers[curPlayerId]);
                cout << "Game name: " << gameName << endl;
 
@@ -921 +934 @@
                
                mapGames[gameName] = numPlayers;
+
+               break;
+            }
+            case MSG_TYPE_PLAYER:
+            {
+               cout << "Received MSG_TYPE_PLAYER" << endl;
+
+               Player* p = new Player("", "");
+               p->deserialize(msg.buffer);
+               p->timeLastUpdated = getCurrentMillis();
+               p->isChasing = false;
+               if (p->health <= 0)
+                  p->isDead = true;
+               else
+                  p->isDead = false;
+
+               if (mapPlayers.find(p->id) != mapPlayers.end())
+                    delete mapPlayers[p->id];
+               mapPlayers[p->id] = p;
+
+               game->addPlayer(p);
 
                break;