Index: common/Game.cpp
===================================================================
--- common/Game.cpp	(revision 204edcfabd7cdcdce0a9f3a3d8a8b26aab260601)
+++ common/Game.cpp	(revision 0678d60fbc8ee53830d5ab6f4239a19299136499)
@@ -162,5 +162,5 @@
    vector<WorldMap::Object>* vctObjects = this->worldMap->getObjects();
    vector<WorldMap::Object>::iterator it;
-   int playerId = -1;
+   int itemId = -1;
 
    for (it = vctObjects->begin(); it != vctObjects->end(); it++) {
@@ -170,5 +170,5 @@
                if (p->team == 1) {
                   p->hasBlueFlag = true;
-                  playerId = it->id;
+                  itemId = it->id;
                }
                break;
@@ -176,17 +176,19 @@
                if (p->team == 0) {
                   p->hasRedFlag = true;
-                  playerId = it->id;
+                  itemId = it->id;
                }
                break;
-         }
-
-         if (playerId > -1) {
+            case WorldMap::OBJECT_NONE:
+               break;
+         }
+
+         if (itemId > -1) {
             vctObjects->erase(it);
-            return playerId;
-         }
-      }
-   }
-
-   return playerId;
+            return itemId;
+         }
+      }
+   }
+
+   return itemId;
 }
 
@@ -214,5 +216,4 @@
 
 bool Game::handleGameEvents() {
-   NETWORK_MSG serverMsg;
    map<unsigned int, Player*>::iterator it;
    bool gameFinished = false;
@@ -325,4 +326,8 @@
             }
 
+            break;
+         }
+         default:
+         {
             break;
          }
Index: common/MessageProcessor.cpp
===================================================================
--- common/MessageProcessor.cpp	(revision 204edcfabd7cdcdce0a9f3a3d8a8b26aab260601)
+++ common/MessageProcessor.cpp	(revision 0678d60fbc8ee53830d5ab6f4239a19299136499)
@@ -42,6 +42,6 @@
    if (ret < 0)
       error("sendMessage");
-   else
-      return ret;
+
+   return ret;
 }
 
Index: common/Player.cpp
===================================================================
--- common/Player.cpp	(revision 204edcfabd7cdcdce0a9f3a3d8a8b26aab260601)
+++ common/Player.cpp	(revision 0678d60fbc8ee53830d5ab6f4239a19299136499)
@@ -150,7 +150,4 @@
          cout << "No class" << endl;
          break;
-      dafault:
-         cout << "nvalid class" << endl;
-         break;
    }
 }
Index: common/WorldMap.cpp
===================================================================
--- common/WorldMap.cpp	(revision 204edcfabd7cdcdce0a9f3a3d8a8b26aab260601)
+++ common/WorldMap.cpp	(revision 0678d60fbc8ee53830d5ab6f4239a19299136499)
@@ -45,4 +45,21 @@
 }
 
+void WorldMap::createObjectsFromStructures() {
+   for (int y=0; y<this->height; y++) {
+      for (int x=0; x<this->width; x++) {
+         switch (this->getStructure(x, y)) {
+            case WorldMap::STRUCTURE_BLUE_FLAG:
+               this->addObject(WorldMap::OBJECT_BLUE_FLAG, x*25+12, y*25+12);
+               break;
+            case WorldMap::STRUCTURE_RED_FLAG:
+               this->addObject(WorldMap::OBJECT_RED_FLAG, x*25+12, y*25+12);
+               break;
+            case WorldMap::STRUCTURE_NONE:
+               break;
+         }
+      }
+   }
+}
+
 WorldMap::TerrainType WorldMap::getElement(int x, int y)
 {
@@ -71,6 +88,6 @@
    pos.y = 0;
 
-   for (int x=0; x<vctStructures->size(); x++) {
-      for (int y=0; y<(*vctStructures)[x]->size(); y++) {
+   for (unsigned int x=0; x<vctStructures->size(); x++) {
+      for (unsigned int y=0; y<(*vctStructures)[x]->size(); y++) {
         if ((*(*vctStructures)[x])[y] == t) {
            pos.x = x;
@@ -131,4 +148,7 @@
    case WorldMap::OBJECT_RED_FLAG:
       cout << "RED_FLAG" << endl;
+      break;
+   case WorldMap::OBJECT_NONE:
+      cout << "OBJECY_NONE" << endl;
       break;
    }
@@ -145,4 +165,7 @@
             cout << "RED_FLAG" << endl;
             break;
+         case WorldMap::OBJECT_NONE:
+            cout << "OBJECY_NONE" << endl;
+            break;
          }
          it->pos.x = x;
Index: common/WorldMap.h
===================================================================
--- common/WorldMap.h	(revision 204edcfabd7cdcdce0a9f3a3d8a8b26aab260601)
+++ common/WorldMap.h	(revision 0678d60fbc8ee53830d5ab6f4239a19299136499)
@@ -54,4 +54,6 @@
    ~WorldMap();
 
+   void createObjectsFromStructures();
+
    TerrainType getElement(int x, int y);
    void setElement(int x, int y, TerrainType type);
Index: server/DataAccess.cpp
===================================================================
--- server/DataAccess.cpp	(revision 204edcfabd7cdcdce0a9f3a3d8a8b26aab260601)
+++ server/DataAccess.cpp	(revision 0678d60fbc8ee53830d5ab6f4239a19299136499)
@@ -177,5 +177,4 @@
 MYSQL_RES *DataAccess::select(string table, string filter)
 {
-   MYSQL_RES *result;
    int query_state;
    ostringstream oss;
Index: server/server.cpp
===================================================================
--- server/server.cpp	(revision 204edcfabd7cdcdce0a9f3a3d8a8b26aab260601)
+++ server/server.cpp	(revision 0678d60fbc8ee53830d5ab6f4239a19299136499)
@@ -589,18 +589,5 @@
             // add flag objects to the map
             WorldMap* m = g->getMap();
-            for (int y=0; y<m->height; y++) {
-               for (int x=0; x<m->width; x++) {
-                  switch (m->getStructure(x, y)) {
-                     case WorldMap::STRUCTURE_BLUE_FLAG:
-                        m->addObject(WorldMap::OBJECT_BLUE_FLAG, x*25+12, y*25+12);
-                        break;
-                     case WorldMap::STRUCTURE_RED_FLAG:
-                        m->addObject(WorldMap::OBJECT_RED_FLAG, x*25+12, y*25+12);
-                        break;
-                     case WorldMap::STRUCTURE_NONE:
-                        break;
-                  }
-               }
-            }
+            m->createObjectsFromStructures();
 
             serverMsg.type = MSG_TYPE_JOIN_GAME_SUCCESS;