Index: client/Client/main.cpp
===================================================================
--- client/Client/main.cpp	(revision f63aa57a81ffc2ca07d9bc33957d13945291cc0f)
+++ client/Client/main.cpp	(revision 3ff2bd7ef8b47dfbc5af4481f3f44b76965c8f8f)
@@ -95,5 +95,5 @@
 Window* wndLobby;
 Window* wndLobbyDebug;
-Window* wndNewGame;
+Window* wndGame;
 Window* wndGameSummary;
 Window* wndCurrent;
@@ -287,6 +287,6 @@
    cout << "Created debug lobby screen" << endl;
 
-   wndNewGame = new Window(0, 0, SCREEN_W, SCREEN_H);
-   vctComponents.push_back(wndNewGame->addComponent(new Button(880, 10, 120, 20, font, "Leave Game", leaveGame)));
+   wndGame = new Window(0, 0, SCREEN_W, SCREEN_H);
+   vctComponents.push_back(wndGame->addComponent(new Button(880, 10, 120, 20, font, "Leave Game", leaveGame)));
 
    cout << "Created new game screen" << endl;
@@ -398,5 +398,5 @@
       }
       else if(ev.type == ALLEGRO_EVENT_MOUSE_BUTTON_UP) {
-         if(wndCurrent == wndNewGame) {
+         if(wndCurrent == wndGame) {
             if (ev.mouse.button == 1) {   // left click
                msgTo.type = MSG_TYPE_PLAYER_MOVE;
@@ -439,5 +439,5 @@
                      cout << "Found valid target" << endl;
 
-                     msgTo.type = MSG_TYPE_START_ATTACK;
+                     msgTo.type = MSG_TYPE_ATTACK;
                      memcpy(msgTo.buffer, &curPlayerId, 4);
                      memcpy(msgTo.buffer+4, &target->id, 4);
@@ -479,5 +479,5 @@
             }
          }
-         else if (wndCurrent == wndNewGame)
+         else if (wndCurrent == wndGame)
          {
             al_draw_text(font, al_map_rgb(0, 255, 0), 4, 4, ALLEGRO_ALIGN_LEFT, "Players");
@@ -486,9 +486,11 @@
             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++;
+            if (!debugging) {
+               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++;
+               }
             }
 
@@ -589,5 +591,5 @@
    delete wndLobby;
    delete wndLobbyDebug;
-   delete wndNewGame;
+   delete wndGame;
    delete wndGameSummary;
 
@@ -807,10 +809,4 @@
             case MSG_TYPE_ATTACK:
             {
-               cout << "Received ATTACK message" << endl;
-
-               break;
-            }
-            case MSG_TYPE_START_ATTACK:
-            {
                cout << "Received START_ATTACK message" << endl;
 
@@ -889,5 +885,5 @@
 
                state = STATE_GAME;
-               wndCurrent = wndNewGame;
+               wndCurrent = wndGame;
 
                msgTo.type = MSG_TYPE_JOIN_GAME_ACK;
@@ -1086,10 +1082,4 @@
             case MSG_TYPE_ATTACK:
             {
-               cout << "Received ATTACK message" << endl;
-
-               break;
-            }
-            case MSG_TYPE_START_ATTACK:
-            {
                cout << "Received START_ATTACK message" << endl;
 
@@ -1185,5 +1175,5 @@
    al_draw_text(font, al_map_rgb(0, 255, 255), 240+clientMsgOffset, 43, ALLEGRO_ALIGN_LEFT, "Acked?");
 
-   al_draw_text(font, al_map_rgb(0, 255, 255), serverMsgOffset, 43, ALLEGRO_ALIGN_LEFT, "ID");
+   //al_draw_text(font, al_map_rgb(0, 255, 255), serverMsgOffset, 43, ALLEGRO_ALIGN_LEFT, "ID");
 
    map<unsigned int, map<unsigned long, MessageContainer> >& sentMessages = msgProcessor.getSentMessages();