Index: common/Message.cpp
===================================================================
--- common/Message.cpp	(revision 09ddba7dbba8667a4de6e3bd284419ddef3ea498)
+++ 	(revision )
@@ -1,36 +1,0 @@
-#include "Message.h"
-
-#include "Compiler.h"
-
-#if defined WINDOWS
-   #include <winsock2.h>
-   #include <WS2tcpip.h>
-#elif defined LINUX
-   #include <sys/socket.h>
-   #include <netinet/in.h>
-#endif
-
-#include <iostream>
-
-using namespace std;
-
-/*
-int sendMessage(NETWORK_MSG *msg, int sock, struct sockaddr_in *dest)
-{
-   int ret =  sendto(sock, (char*)msg, sizeof(NETWORK_MSG), 0, (struct sockaddr *)dest, sizeof(struct sockaddr_in));
-
-   cout << "Send a message of type " << msg->type << endl;
-
-   return ret;
-}
-
-int receiveMessage(NETWORK_MSG *msg, int sock, struct sockaddr_in *source)
-{
-   socklen_t socklen = sizeof(struct sockaddr_in);
-
-   // assume we don't care about the value of socklen
-   int ret =  recvfrom(sock, (char*)msg, sizeof(NETWORK_MSG), 0, (struct sockaddr *)source, &socklen);
-
-   return ret;
-}
-*/
Index: common/Message.h
===================================================================
--- common/Message.h	(revision 09ddba7dbba8667a4de6e3bd284419ddef3ea498)
+++ 	(revision )
@@ -1,32 +1,0 @@
-#ifndef _MESSAGE_H
-#define _MESSAGE_H
-
-#define MSG_TYPE_ACK               1
-#define MSG_TYPE_REGISTER          2
-#define MSG_TYPE_LOGIN             3
-#define MSG_TYPE_LOGOUT            4
-#define MSG_TYPE_CHAT              5
-#define MSG_TYPE_PLAYER            6  // server sends this to update player positions
-#define MSG_TYPE_PLAYER_MOVE       7  // client sends this when a player wants to move
-#define MSG_TYPE_OBJECT            8
-#define MSG_TYPE_REMOVE_OBJECT     9
-#define MSG_TYPE_PICKUP_FLAG       10
-#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
-
-typedef struct
-{
-   unsigned int id;
-   unsigned short type;
-   char buffer[256];
-} NETWORK_MSG;
-
-//int sendMessage(NETWORK_MSG *msg, int sock, struct sockaddr_in *dest);
-
-//int receiveMessage(NETWORK_MSG *msg, int sock, struct sockaddr_in *source);
-
-#endif
Index: common/MessageProcessor.h
===================================================================
--- common/MessageProcessor.h	(revision 09ddba7dbba8667a4de6e3bd284419ddef3ea498)
+++ common/MessageProcessor.h	(revision 49da01a0a5c0ebb0b6e93db32fc55ebb93e80940)
@@ -15,27 +15,27 @@
 #endif
 
-/*
-#define MSG_TYPE_REGISTER          1
-#define MSG_TYPE_LOGIN             2
-#define MSG_TYPE_LOGOUT            3
-#define MSG_TYPE_CHAT              4
-#define MSG_TYPE_PLAYER            5  // server sends this to update player positions
-#define MSG_TYPE_PLAYER_MOVE       6  // client sends this when a player wants to move
-#define MSG_TYPE_OBJECT            7
-#define MSG_TYPE_REMOVE_OBJECT     8
-#define MSG_TYPE_PICKUP_FLAG       9
-#define MSG_TYPE_DROP_FLAG         10
-#define MSG_TYPE_SCORE             11
-#define MSG_TYPE_START_ATTACK      12
-#define MSG_TYPE_ATTACK            13
-#define MSG_TYPE_PROJECTILE        14
-#define MSG_TYPE_REMOVE_PROJECTILE 15
+#define MSG_TYPE_ACK               1
+#define MSG_TYPE_REGISTER          2
+#define MSG_TYPE_LOGIN             3
+#define MSG_TYPE_LOGOUT            4
+#define MSG_TYPE_CHAT              5
+#define MSG_TYPE_PLAYER            6  // server sends this to update player positions
+#define MSG_TYPE_PLAYER_MOVE       7  // client sends this when a player wants to move
+#define MSG_TYPE_OBJECT            8
+#define MSG_TYPE_REMOVE_OBJECT     9
+#define MSG_TYPE_PICKUP_FLAG       10
+#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
 
 typedef struct
 {
-   short type;
+   unsigned int id;
+   unsigned short type;
    char buffer[256];
 } NETWORK_MSG;
-*/
 
 using namespace std;