Index: client/Client/main.cpp
===================================================================
--- client/Client/main.cpp	(revision 6e66ffdf57ffae5c067c3c8b3e2101b2e7d49e5e)
+++ client/Client/main.cpp	(revision 45b2750be478f0b876f68707f4c72976433a90f5)
@@ -47,5 +47,5 @@
 void initWinSock();
 void shutdownWinSock();
-void processMessage(NETWORK_MSG &msg, int &state, chat &chatConsole, map<unsigned int, Player>& mapPlayers, unsigned int& curPlayerId);
+void processMessage(NETWORK_MSG &msg, int &state, chat &chatConsole, WorldMap *gameMap, map<unsigned int, Player>& mapPlayers, unsigned int& curPlayerId);
 void drawMap(WorldMap* gameMap);
 void drawPlayers(map<unsigned int, Player>& mapPlayers, unsigned int curPlayerId);
@@ -265,5 +265,5 @@
 
       if (receiveMessage(&msgFrom, sock, &from) >= 0)
-         processMessage(msgFrom, state, chatConsole, mapPlayers, curPlayerId);
+         processMessage(msgFrom, state, chatConsole, gameMap, mapPlayers, curPlayerId);
 
       if (redraw)
@@ -381,5 +381,5 @@
 }
 
-void processMessage(NETWORK_MSG &msg, int &state, chat &chatConsole, map<unsigned int, Player>& mapPlayers, unsigned int& curPlayerId)
+void processMessage(NETWORK_MSG &msg, int &state, chat &chatConsole, WorldMap *gameMap, map<unsigned int, Player>& mapPlayers, unsigned int& curPlayerId)
 {
    string response = string(msg.buffer);
@@ -443,4 +443,14 @@
                break;
             }
+            case MSG_TYPE_OBJECT:
+            {
+               cout << "Received object message. Baller Biller!" << endl;
+
+               WorldMap::Object o(0, WorldMap::OBJECT_NONE, 0, 0);
+               o.deserialize(msg.buffer);
+               gameMap->updateObject(o.id, o.type, o.pos.x, o.pos.y);
+
+               break;
+            }
          }
 
@@ -509,4 +519,18 @@
 
                break;
+            }
+            case MSG_TYPE_OBJECT:
+            {
+               cout << "Received object message. Baller Biller!" << endl;
+
+               WorldMap::Object o(0, WorldMap::OBJECT_NONE, 0, 0);
+               o.deserialize(msg.buffer);
+               gameMap->updateObject(o.id, o.type, o.pos.x, o.pos.y);
+
+               break;
+            }
+            default:
+            {
+               cout << "Received an unexpected message type: " << msg.type << endl;
             }
          }