Index: common/Common.h
===================================================================
--- common/Common.h	(revision 60b77d211177cc4fb312ffdc3f6873bc8b6bc46d)
+++ common/Common.h	(revision 62ee2ceb8ecee33c00a41267ea1c22a94758a04d)
@@ -18,5 +18,5 @@
    int x;
    int y;
-} PLAYER_POS;
+} POSITION;
 
 #endif
Index: common/Map.cpp
===================================================================
--- common/Map.cpp	(revision 60b77d211177cc4fb312ffdc3f6873bc8b6bc46d)
+++ 	(revision )
@@ -1,51 +1,0 @@
-#include "Map.h"
-
-using namespace std;
-
-Map::Map(int width, int height)
-{
-   this->width = width;
-   this->height = height;
-
-   vctMap = new vector<vector<TerrainType>*>(width);
-
-   for (int x=0; x<width; x++) {
-      vector<TerrainType>* newVector = new vector<TerrainType>(height);
-
-      for (int y=0; y<height; y++)
-         (*newVector)[y] = TERRAIN_NONE;
-
-      (*vctMap)[x] = newVector;
-   }
-}
-
-Map::~Map()
-{
-   for (int x=0; x<width; x++)
-      delete (*vctMap)[x];
-
-   delete vctMap;
-}
-
-void Map::setElement(int x, int y, TerrainType t)
-{
-   (*(*vctMap)[x])[y] = t;
-}
-
-Map* Map::createDefaultMap()
-{
-   Map* m = new Map(20l, 20);
-
-   for(int x=0; x<20; x++)
-   {   
-      for(int y=0; y<20; y++)
-      {
-         if (x ==0 || y == 0 || x == 19 || y == 19)
-            m->setElement(x, y, TERRAIN_OCEAN);
-         else
-            m->setElement(x, y, TERRAIN_GRASS);
-      }
-   }
-
-   return m;
-}
Index: common/Map.h
===================================================================
--- common/Map.h	(revision 60b77d211177cc4fb312ffdc3f6873bc8b6bc46d)
+++ 	(revision )
@@ -1,28 +1,0 @@
-#ifndef _MAP_H
-#define _MAP_H
-
-#include <vector>
-
-using namespace std;
-
-class Map {
-public:
-   enum TerrainType {
-      TERRAIN_NONE,
-      TERRAIN_GRASS,
-      TERRAIN_OCEAN
-   };
-
-   int width, height;
-   vector<vector<TerrainType>*>* vctMap;
-
-   Map(int width, int height);
-
-   ~Map();
-
-   void setElement(int x, int y, TerrainType type);
-
-   static Map* createDefaultMap();
-};
-
-#endif
Index: common/Player.h
===================================================================
--- common/Player.h	(revision 60b77d211177cc4fb312ffdc3f6873bc8b6bc46d)
+++ common/Player.h	(revision 62ee2ceb8ecee33c00a41267ea1c22a94758a04d)
@@ -36,5 +36,5 @@
    string password;
    sockaddr_in addr;
-   PLAYER_POS pos;
+   POSITION pos;
 };
 
Index: common/WorldMap.cpp
===================================================================
--- common/WorldMap.cpp	(revision 62ee2ceb8ecee33c00a41267ea1c22a94758a04d)
+++ common/WorldMap.cpp	(revision 62ee2ceb8ecee33c00a41267ea1c22a94758a04d)
@@ -0,0 +1,58 @@
+#include "WorldMap.h"
+
+using namespace std;
+
+WorldMap::WorldMap(int width, int height)
+{
+   this->width = width;
+   this->height = height;
+
+   vctMap = new vector<vector<TerrainType>*>(width);
+
+   for (int x=0; x<width; x++) {
+      vector<TerrainType>* newVector = new vector<TerrainType>(height);
+
+      for (int y=0; y<height; y++)
+         (*newVector)[y] = TERRAIN_NONE;
+
+      (*vctMap)[x] = newVector;
+   }
+}
+
+WorldMap::~WorldMap()
+{
+   for (int x=0; x<width; x++)
+      delete (*vctMap)[x];
+
+   delete vctMap;
+}
+
+WorldMap::TerrainType WorldMap::getElement(int x, int y)
+{
+   return (*(*vctMap)[x])[y];
+}
+
+void WorldMap::setElement(int x, int y, TerrainType t)
+{
+   (*(*vctMap)[x])[y] = t;
+}
+
+WorldMap* WorldMap::createDefaultMap()
+{
+   WorldMap* m = new WorldMap(12l, 12);
+
+   for(int x=0; x<12; x++)
+   {   
+      for(int y=0; y<12; y++)
+      {
+         if (x ==0 || y == 0 || x == 11 || y == 11)
+            m->setElement(x, y, TERRAIN_OCEAN);
+         else
+            m->setElement(x, y, TERRAIN_GRASS);
+      }
+   }
+
+   m->setElement(5, 5, TERRAIN_ROCK);
+
+   return m;
+}
Index: common/WorldMap.h
===================================================================
--- common/WorldMap.h	(revision 62ee2ceb8ecee33c00a41267ea1c22a94758a04d)
+++ common/WorldMap.h	(revision 62ee2ceb8ecee33c00a41267ea1c22a94758a04d)
@@ -0,0 +1,30 @@
+#ifndef _WORLDMAP_H
+#define _WORLDMAP_H
+
+#include <vector>
+
+using namespace std;
+
+class WorldMap {
+public:
+   enum TerrainType {
+      TERRAIN_NONE,
+      TERRAIN_GRASS,
+      TERRAIN_OCEAN,
+      TERRAIN_ROCK
+   };
+
+   int width, height;
+   vector<vector<TerrainType>*>* vctMap;
+
+   WorldMap(int width, int height);
+
+   ~WorldMap();
+
+   TerrainType getElement(int x, int y);
+   void setElement(int x, int y, TerrainType type);
+
+   static WorldMap* createDefaultMap();
+};
+
+#endif