Index: client/Client/main.cpp
===================================================================
--- client/Client/main.cpp	(revision 032e550f203118773ba914a911e18d4385ce71c2)
+++ client/Client/main.cpp	(revision 5a5f131da3494898fa508a51e9526afc3f65ab16)
@@ -367,5 +367,4 @@
             for (it2 = mapProjectiles.begin(); it2 != mapProjectiles.end(); it2++)
             {
-               cout << "Update projectile position" << endl;
                it2->second.move(mapPlayers);
             }
@@ -377,6 +376,4 @@
             for (it2 = mapProjectiles.begin(); it2 != mapProjectiles.end(); it2++)
             {
-               cout << "Draw projectile" << endl;
-
                Projectile proj = it2->second;
 
@@ -532,20 +529,14 @@
             case MSG_TYPE_PLAYER:   // kind of hacky to put this here
             {
-               cout << "Got MSG_TYPE_PLAYER message in STATE_START" << endl;
-
                Player p("", "");
                p.deserialize(msg.buffer);
                p.timeLastUpdated = getCurrentMillis();
+
                mapPlayers[p.id] = p;
 
-               cout << "new player id: " << p.id << endl;
-               cout << "map size: " << mapPlayers.size() << endl;
-
                break;
             }
             case MSG_TYPE_OBJECT:
             {
-               cout << "Received OBJECT message in STATE_START." << endl;
-
                WorldMap::Object o(0, WorldMap::OBJECT_NONE, 0, 0);
                o.deserialize(msg.buffer);
@@ -591,10 +582,13 @@
             case MSG_TYPE_PLAYER:
             {
-               //cout << "Got MSG_TYPE_PLAYER message in STATE_LOGIN" << endl;
-
                Player p("", "");
                p.deserialize(msg.buffer);
                p.timeLastUpdated = getCurrentMillis();
                p.isChasing = false;
+               if (p.health <= 0)
+                  p.isDead = true;
+               else
+                  p.isDead = false;
+
                mapPlayers[p.id] = p;
 
@@ -603,6 +597,4 @@
             case MSG_TYPE_PLAYER_MOVE:
             {
-               cout << "Got a player move message" << endl;
-
                unsigned int id;
                int x, y;
@@ -793,4 +785,8 @@
    {
       p = &it->second;
+
+      if (p->isDead)
+         continue;
+
       pos = mapToScreen(p->pos);