Index: common/Player.cpp
===================================================================
--- common/Player.cpp	(revision d998572d2b8fca258d9a75165638a41951561866)
+++ common/Player.cpp	(revision 9ba9b968bccdc6fe97763cbbad7fb022eac68c94)
@@ -100,5 +100,5 @@
 }
 
-void Player::setId(int id)
+void Player::setId(unsigned int id)
 {
    this->id = id;
Index: common/Player.h
===================================================================
--- common/Player.h	(revision d998572d2b8fca258d9a75165638a41951561866)
+++ common/Player.h	(revision 9ba9b968bccdc6fe97763cbbad7fb022eac68c94)
@@ -41,5 +41,5 @@
    ~Player();
 
-   void setId(int id);
+   void setId(unsigned int id);
    void setAddr(sockaddr_in addr);
    void setClass(PlayerClass c);
@@ -52,8 +52,8 @@
    void takeDamage(int damage);
 
-   void takeFlag(int flag, WorldMap* map);
-   void dropFlag(int flag, WorldMap* map);
+   void takeFlag(unsigned int flag, WorldMap* map);
+   void dropFlag(unsigned int flag, WorldMap* map);
 
-   int id;
+   unsigned int id;
    string name;
    string password;
@@ -66,5 +66,5 @@
    bool isChasing;
    bool isAttacking;
-   int targetPlayer;
+   unsigned int targetPlayer;
    bool isDead;
 
Index: common/Projectile.cpp
===================================================================
--- common/Projectile.cpp	(revision d998572d2b8fca258d9a75165638a41951561866)
+++ common/Projectile.cpp	(revision 9ba9b968bccdc6fe97763cbbad7fb022eac68c94)
@@ -45,5 +45,5 @@
 }
 
-void Projectile::setId(int id)
+void Projectile::setId(unsigned int id)
 {
    this->id = id;
Index: common/Projectile.h
===================================================================
--- common/Projectile.h	(revision d998572d2b8fca258d9a75165638a41951561866)
+++ common/Projectile.h	(revision 9ba9b968bccdc6fe97763cbbad7fb022eac68c94)
@@ -13,4 +13,10 @@
 class Projectile {
 public:
+   unsigned int id;
+   POSITION pos;
+   unsigned int target;
+   int speed;
+   int damage;
+   unsigned long long timeLastUpdated;
 
    Projectile();
@@ -20,23 +26,11 @@
    ~Projectile();
 
-   void setId(int id);
+   void setId(unsigned int id);
 
    void serialize(char* buffer);
    void deserialize(char* buffer);
 
-   // returns true if it reached the target and should be deleted
+   // returns true if the projectile reached the target and should be deleted
    bool move(map<unsigned int, Player*>& mapPlayers);
-
-   /*
-    * target should become a Player*. When this object gets serialized, the player's id should be sent.
-    * Deserialization in this case might be tricky since it will require a playerMap to turn the id into a Plauyer*
-    */
-
-   int id;
-   POSITION pos;
-   int target;
-   int speed;
-   int damage;
-   unsigned long long timeLastUpdated;
 };
 
Index: common/WorldMap.cpp
===================================================================
--- common/WorldMap.cpp	(revision d998572d2b8fca258d9a75165638a41951561866)
+++ common/WorldMap.cpp	(revision 9ba9b968bccdc6fe97763cbbad7fb022eac68c94)
@@ -102,5 +102,5 @@
 // used by the server to create new objects
 void WorldMap::addObject(WorldMap::ObjectType t, int x, int y) {
-   int id;
+   unsigned int id;
    vector<WorldMap::Object>::iterator it;
 
@@ -111,5 +111,5 @@
       }
 
-      if (it == vctObjects->end())  // if no objects with this id exists
+      if (it == vctObjects->end())  // if no objects with this id exist
          break;
    }
@@ -120,5 +120,5 @@
 
 // used by the client to update object positions or create objects it has not seen before
-void WorldMap::updateObject(int id, WorldMap::ObjectType t, int x, int y) {
+void WorldMap::updateObject(unsigned int id, WorldMap::ObjectType t, int x, int y) {
    vector<WorldMap::Object>::iterator it;
    bool foundObject = false;
@@ -157,5 +157,5 @@
 }
 
-bool WorldMap::removeObject(int id) {
+bool WorldMap::removeObject(unsigned int id) {
    vector<WorldMap::Object>::iterator it;
 
@@ -316,5 +316,5 @@
 /*** Functions for Object ***/
 
-WorldMap::Object::Object(int id, ObjectType type, int x, int y) {
+WorldMap::Object::Object(unsigned int id, ObjectType type, int x, int y) {
    this->type = type;
    this->id = id;
@@ -323,5 +323,5 @@
 }
 
-WorldMap::Object::Object(int id, ObjectType type, POSITION pos) {
+WorldMap::Object::Object(unsigned int id, ObjectType type, POSITION pos) {
    this->type = type;
    this->id = id;
Index: common/WorldMap.h
===================================================================
--- common/WorldMap.h	(revision d998572d2b8fca258d9a75165638a41951561866)
+++ common/WorldMap.h	(revision 9ba9b968bccdc6fe97763cbbad7fb022eac68c94)
@@ -32,10 +32,10 @@
    class Object {
    public:
-      int id;
+      unsigned int id;
       ObjectType type;
       POSITION pos;
 
-      Object(int id, ObjectType type, int x, int y);
-      Object(int id, ObjectType type, POSITION pos);
+      Object(unsigned int id, ObjectType type, int x, int y);
+      Object(unsigned int id, ObjectType type, POSITION pos);
 
       ~Object();
@@ -65,6 +65,6 @@
 
    void addObject(ObjectType type, int x, int y);
-   void updateObject(int id, WorldMap::ObjectType t, int x, int y);
-   bool removeObject(int id);
+   void updateObject(unsigned int id, WorldMap::ObjectType t, int x, int y);
+   bool removeObject(unsigned int id);
 
    static WorldMap* createDefaultMap();
Index: server/server.cpp
===================================================================
--- server/server.cpp	(revision d998572d2b8fca258d9a75165638a41951561866)
+++ server/server.cpp	(revision 9ba9b968bccdc6fe97763cbbad7fb022eac68c94)
@@ -450,5 +450,6 @@
          cout << "PLAYER_MOVE" << endl;
 
-         int id, x, y;
+         unsigned int id;
+         int x, y;
 
          memcpy(&id, clientMsg.buffer, 4);
@@ -493,5 +494,5 @@
          cout << "PICKUP_FLAG" << endl;
 
-         int id;
+         unsigned int id;
 
          memcpy(&id, clientMsg.buffer, 4);
@@ -499,5 +500,5 @@
 
          Player* p = mapPlayers[id];
-         int objectId = p->currentGame->processFlagPickupRequest(p);
+         unsigned int objectId = p->currentGame->processFlagPickupRequest(p);
 
          if (objectId >= 0) {
@@ -520,5 +521,5 @@
          cout << "DROP_FLAG" << endl;
 
-         int id;
+         unsigned int id;
 
          memcpy(&id, clientMsg.buffer, 4);
@@ -550,5 +551,5 @@
          cout << "Received a START_ATTACK message" << endl;
 
-         int id, targetId;
+         unsigned int id, targetId;
 
          memcpy(&id, clientMsg.buffer, 4);
@@ -726,6 +727,6 @@
          serverMsg.type = MSG_TYPE_SCORE;
 
-         int blueScore = g->getBlueScore();
-         int redScore = g->getRedScore();
+         unsigned int blueScore = g->getBlueScore();
+         unsigned int redScore = g->getRedScore();
          memcpy(serverMsg.buffer, &blueScore, 4);
          memcpy(serverMsg.buffer+4, &redScore, 4);