Index: client/Client/GameRender.cpp
===================================================================
--- client/Client/GameRender.cpp	(revision 53d41eafe0cfbdcef429ba7c77ada890f9a61694)
+++ client/Client/GameRender.cpp	(revision b4c5b6ac537df952036c2144bb4926685f691175)
@@ -63,5 +63,5 @@
    ALLEGRO_COLOR color;
 
-   for(it = mapPlayers.begin(); it != mapPlayers.end(); it++)
+   for (it = mapPlayers.begin(); it != mapPlayers.end(); it++)
    {
       p = it->second;
Index: client/Client/main.cpp
===================================================================
--- client/Client/main.cpp	(revision 53d41eafe0cfbdcef429ba7c77ada890f9a61694)
+++ client/Client/main.cpp	(revision b4c5b6ac537df952036c2144bb4926685f691175)
@@ -472,5 +472,5 @@
             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,4 +480,16 @@
          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,4 +888,5 @@
                string gameName(msg.buffer);         
                game = new Game(gameName, "../../data/map.txt");
+               game->addPlayer(mapPlayers[curPlayerId]);
                cout << "Game name: " << gameName << endl;
 
@@ -921,4 +934,25 @@
                
                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;