Index: client/Client/main.cpp
===================================================================
--- client/Client/main.cpp	(revision 03332115068088913b05df1b81e2290f90509823)
+++ client/Client/main.cpp	(revision eb8adb1425e498d6ce45dbf01c11619912d30905)
@@ -19,4 +19,6 @@
 #include <iostream>
 
+#include <map>
+
 #include <allegro5/allegro.h>
 #include <allegro5/allegro_font.h>
@@ -40,5 +42,5 @@
 void initWinSock();
 void shutdownWinSock();
-void processMessage(NETWORK_MSG &msg, int &state, chat &chatConsole);
+void processMessage(NETWORK_MSG &msg, int &state, chat &chatConsole, map<unsigned int, Player>& mapPlayers);
 
 // callbacks
@@ -95,4 +97,5 @@
    bool redraw = true;
    doexit = false;
+   map<unsigned int, Player> mapPlayers;
 
    float bouncer_x = SCREEN_W / 2.0 - BOUNCER_SIZE / 2.0;
@@ -290,5 +293,5 @@
       if (receiveMessage(&msgFrom, sock, &from) >= 0)
       {
-         processMessage(msgFrom, state, chatConsole);
+         processMessage(msgFrom, state, chatConsole, mapPlayers);
          cout << "state: " << state << endl;
       }
@@ -368,5 +371,5 @@
 }
 
-void processMessage(NETWORK_MSG &msg, int &state, chat &chatConsole)
+void processMessage(NETWORK_MSG &msg, int &state, chat &chatConsole, map<unsigned int, Player>& mapPlayers)
 {
    string response = string(msg.buffer);
@@ -414,7 +417,5 @@
       case STATE_LOGIN:
       {
-         chatConsole.addLine(response);
-
-          switch(msg.type)
+         switch(msg.type)
          {
             case MSG_TYPE_REGISTER:
@@ -424,4 +425,6 @@
             case MSG_TYPE_LOGIN:
             {
+               chatConsole.addLine(response);
+
                if (response.compare("You have successfully logged out.") == 0)
                {
@@ -442,12 +445,21 @@
                p.deserialize(msg.buffer);
 
+               cout << "p.id: " << p.id << endl;
                cout << "p.name: " << p.name << endl;
                cout << "p.pos.x: " << p.pos.x << endl;
                cout << "p.pos.y: " << p.pos.y << endl;
 
+               mapPlayers[p.id] = p;
+
                break;
             }
-         }
-                     
+            case MSG_TYPE_CHAT:
+            {
+               chatConsole.addLine(response);
+
+               break;
+            }
+         }
+
          break;
       }