Index: common/MessageContainer.h
===================================================================
--- common/MessageContainer.h	(revision f63aa57a81ffc2ca07d9bc33957d13945291cc0f)
+++ common/MessageContainer.h	(revision 9bfc1cb345b8dbf607aa15080337ef640459d995)
@@ -26,17 +26,16 @@
 #define MSG_TYPE_DROP_FLAG         11
 #define MSG_TYPE_SCORE             12
-#define MSG_TYPE_START_ATTACK      13
-#define MSG_TYPE_ATTACK            14
-#define MSG_TYPE_PROJECTILE        15
-#define MSG_TYPE_REMOVE_PROJECTILE 16
-#define MSG_TYPE_CREATE_GAME       17
-#define MSG_TYPE_JOIN_GAME         18
-#define MSG_TYPE_LEAVE_GAME        19
-#define MSG_TYPE_GAME_INFO         20
-#define MSG_TYPE_JOIN_GAME_SUCCESS 21
-#define MSG_TYPE_JOIN_GAME_FAILURE 22
-#define MSG_TYPE_JOIN_GAME_ACK     23
-#define MSG_TYPE_PLAYER_JOIN_GAME  24
-#define MSG_TYPE_FINISH_GAME       25
+#define MSG_TYPE_ATTACK            13
+#define MSG_TYPE_PROJECTILE        14
+#define MSG_TYPE_REMOVE_PROJECTILE 15
+#define MSG_TYPE_CREATE_GAME       16
+#define MSG_TYPE_JOIN_GAME         17
+#define MSG_TYPE_LEAVE_GAME        18
+#define MSG_TYPE_GAME_INFO         19
+#define MSG_TYPE_JOIN_GAME_SUCCESS 20
+#define MSG_TYPE_JOIN_GAME_FAILURE 21
+#define MSG_TYPE_JOIN_GAME_ACK     22
+#define MSG_TYPE_PLAYER_JOIN_GAME  23
+#define MSG_TYPE_FINISH_GAME       24
 
 typedef struct
@@ -81,8 +80,16 @@
          case MSG_TYPE_DROP_FLAG: return "MSG_TYPE_DROP_FLAG";
          case MSG_TYPE_SCORE: return "MSG_TYPE_SCORE";
-         case MSG_TYPE_START_ATTACK: return "MSG_TYPE_START_ATACK";
          case MSG_TYPE_ATTACK: return "MSG_TYPE_ATTACK";
          case MSG_TYPE_PROJECTILE: return "MSG_TYPE_PROJECTILE";
          case MSG_TYPE_REMOVE_PROJECTILE: return "MSG_TYPE_REMOVE_PROJECTILE";
+         case MSG_TYPE_CREATE_GAME: return "MSG_TYPE_CREATE_GAME";
+         case MSG_TYPE_JOIN_GAME: return "MSG_TYPE_JOIN_GAME";
+         case MSG_TYPE_LEAVE_GAME: return "MSG_TYPE_LEAVE_GAME";
+         case MSG_TYPE_GAME_INFO: return "MSG_TYPE_GAME_INFO";
+         case MSG_TYPE_JOIN_GAME_SUCCESS: return "MSG_TYPE_JOIN_GAME_SUCCESS";
+         case MSG_TYPE_JOIN_GAME_FAILURE: return "MSG_TYPE_JOIN_GAME_FAILURE";
+         case MSG_TYPE_JOIN_GAME_ACK: return "MSG_TYPE_JOIN_GAME_ACK";
+         case MSG_TYPE_PLAYER_JOIN_GAME: return "MSG_TYPE_PLAYER_JOIN_GAME";
+         case MSG_TYPE_FINISH_GAME: return "MSG_TYPE_FINISH_GAME";
          default: return "Unknown";
       }
Index: server/server.cpp
===================================================================
--- server/server.cpp	(revision f63aa57a81ffc2ca07d9bc33957d13945291cc0f)
+++ server/server.cpp	(revision 9bfc1cb345b8dbf607aa15080337ef640459d995)
@@ -607,5 +607,5 @@
          break;
       }
-      case MSG_TYPE_START_ATTACK:
+      case MSG_TYPE_ATTACK:
       {
          cout << "Received a START_ATTACK message" << endl;
@@ -624,5 +624,5 @@
          map<unsigned int, Player*> players = p->currentGame->getPlayers();
 
-         serverMsg.type = MSG_TYPE_START_ATTACK;
+         serverMsg.type = MSG_TYPE_ATTACK;
          memcpy(serverMsg.buffer, &id, 4);
          memcpy(serverMsg.buffer+4, &targetId, 4);
@@ -1057,9 +1057,4 @@
       cout << "about to broadcast attack" << endl;
 
-      serverMsg.type = MSG_TYPE_ATTACK; 
-      memcpy(serverMsg.buffer, &p->id, 4);
-      memcpy(serverMsg.buffer+4, &p->targetPlayer, 4);
-      broadcastMessage(msgProcessor, serverMsg, playersInGame);
-
       if (p->attackType == Player::ATTACK_MELEE)
       {