Index: server/server.cpp
===================================================================
--- server/server.cpp	(revision 2d78e035fa1069b4c3a2c7dff8d0d53ec15d4700)
+++ server/server.cpp	(revision 45096488194fc2febd193d3374cb66b22569660b)
@@ -611,6 +611,6 @@
          Player::PlayerClass playerClass;
 
+         serverMsg.type = MSG_TYPE_REGISTER;
          memcpy(&playerClass, clientMsg.buffer+username.length()+password.length()+2, 4);
-         serverMsg.type = MSG_TYPE_REGISTER;
 
          cout << "username: " << username << endl;
@@ -727,6 +727,4 @@
          Player *p = findPlayerByName(mapPlayers, name);
 
-         memcpy(serverMsg.buffer, &p->id, 4);
-
          if (p == NULL)
          {
@@ -755,4 +753,7 @@
 
             // broadcast to all players before deleting p from the map
+            serverMsg.type = MSG_TYPE_LOGOUT;
+            memcpy(serverMsg.buffer, &p->id, 4);
+
             map<unsigned int, Player*>::iterator it;
             for (it = mapPlayers.begin(); it != mapPlayers.end(); it++)
@@ -1065,9 +1066,5 @@
          g->removePlayer(p->id);
 
-         // broadcast a messsage to other players so they know someone left the game
-         // also, check if the game has any players left. If not, remove it and send everyone a message so the game is gone from their lobby list
-
          int numPlayers = g->getNumPlayers();
-         cout << "" << endl;
 
          serverMsg.type = MSG_TYPE_GAME_INFO;