Index: client/Client/GameRender.cpp
===================================================================
--- client/Client/GameRender.cpp	(revision 7f884ea475eb4414240346df9f75469295509393)
+++ client/Client/GameRender.cpp	(revision f66d04f1565fc41f8013970471bad11d58b41f8e)
@@ -16,18 +16,18 @@
       for (int y=0; y<gameMap->height; y++)
       {
-         WorldMap::TerrainType el = gameMap->getElement(x, y);
-         WorldMap::StructureType structure = gameMap->getStructure(x, y);
+         TerrainType el = gameMap->getElement(x, y);
+         StructureType structure = gameMap->getStructure(x, y);
 
-         if (el == WorldMap::TERRAIN_GRASS)
+         if (el == TERRAIN_GRASS)
             al_draw_filled_rectangle(x*25+mapPos.x, y*25+mapPos.y, x*25+25+mapPos.x, y*25+25+mapPos.y, al_map_rgb(0, 255, 0));
-         else if (el == WorldMap::TERRAIN_OCEAN)
+         else if (el == TERRAIN_OCEAN)
             al_draw_filled_rectangle(x*25+mapPos.x, y*25+mapPos.y, x*25+25+mapPos.x, y*25+25+mapPos.y, al_map_rgb(0, 0, 255));
-         else if (el == WorldMap::TERRAIN_ROCK)
+         else if (el == TERRAIN_ROCK)
             al_draw_filled_rectangle(x*25+mapPos.x, y*25+mapPos.y, x*25+25+mapPos.x, y*25+25+mapPos.y, al_map_rgb(100, 100, 0));
 
-         if (structure == WorldMap::STRUCTURE_BLUE_FLAG) {
+         if (structure == STRUCTURE_BLUE_FLAG) {
             al_draw_circle(x*25+12+mapPos.x, y*25+12+mapPos.y, 12, al_map_rgb(0, 0, 0), 3);
             //al_draw_filled_rectangle(x*25+5+mapPos.x, y*25+5+mapPos.y, x*25+20+mapPos.x, y*25+20+mapPos.y, al_map_rgb(0, 0, 255));
-         }else if (structure == WorldMap::STRUCTURE_RED_FLAG) {
+         }else if (structure == STRUCTURE_RED_FLAG) {
             al_draw_circle(x*25+12+mapPos.x, y*25+12+mapPos.y, 12, al_map_rgb(0, 0, 0), 3);
             //al_draw_filled_rectangle(x*25+5+mapPos.x, y*25+5+mapPos.y, x*25+20+mapPos.x, y*25+20+mapPos.y, al_map_rgb(255, 0, 0));
@@ -45,8 +45,8 @@
          for(it = vctObjects.begin(); it != vctObjects.end(); it++) {
             switch(it->type) {
-               case WorldMap::OBJECT_BLUE_FLAG:
+               case OBJECT_BLUE_FLAG:
                   al_draw_filled_rectangle(it->pos.x-8+mapPos.x, it->pos.y-8+mapPos.y, it->pos.x+8+mapPos.x, it->pos.y+8+mapPos.y, al_map_rgb(0, 0, 255));
                   break;
-               case WorldMap::OBJECT_RED_FLAG:
+               case OBJECT_RED_FLAG:
                   al_draw_filled_rectangle(it->pos.x-8+mapPos.x, it->pos.y-8+mapPos.y, it->pos.x+8+mapPos.x, it->pos.y+8+mapPos.y, al_map_rgb(255, 0, 0));
                   break;
Index: client/Client/main.cpp
===================================================================
--- client/Client/main.cpp	(revision 7f884ea475eb4414240346df9f75469295509393)
+++ client/Client/main.cpp	(revision f66d04f1565fc41f8013970471bad11d58b41f8e)
@@ -377,12 +377,12 @@
 
                   if (p != NULL) {
-                     int flagType = WorldMap::OBJECT_NONE;
+                     int flagType = OBJECT_NONE;
 
                      if (p->hasBlueFlag)
-                        flagType = WorldMap::OBJECT_BLUE_FLAG;
+                        flagType = OBJECT_BLUE_FLAG;
                      else if (p->hasRedFlag)
-                        flagType = WorldMap::OBJECT_RED_FLAG;
-
-                     if (flagType != WorldMap::OBJECT_NONE) {
+                        flagType = OBJECT_RED_FLAG;
+
+                     if (flagType != OBJECT_NONE) {
                         msgTo.type = MSG_TYPE_DROP_FLAG;
                         memcpy(msgTo.buffer, &curPlayerId, 4);
@@ -1029,5 +1029,5 @@
                cout << "Received object message in STATE_GAME" << endl;
 
-               WorldMap::Object o(0, WorldMap::OBJECT_NONE, 0, 0);
+               WorldMap::Object o(0, OBJECT_NONE, 0, 0);
                o.deserialize(msg.buffer);
                cout << "object id: " << o.id << endl;