Index: common/Map.cpp
===================================================================
--- common/Map.cpp	(revision 60b77d211177cc4fb312ffdc3f6873bc8b6bc46d)
+++ common/Map.cpp	(revision 60b77d211177cc4fb312ffdc3f6873bc8b6bc46d)
@@ -0,0 +1,51 @@
+#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)
+++ common/Map.h	(revision 60b77d211177cc4fb312ffdc3f6873bc8b6bc46d)
@@ -0,0 +1,28 @@
+#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/Message.h
===================================================================
--- common/Message.h	(revision 5806dc221ad8a882fab3da707fe8ed2896dd396e)
+++ common/Message.h	(revision 60b77d211177cc4fb312ffdc3f6873bc8b6bc46d)
@@ -6,6 +6,6 @@
 #define MSG_TYPE_LOGOUT       3
 #define MSG_TYPE_CHAT         4
-#define MSG_TYPE_PLAYER       5
-#define MSG_TYPE_PLAYER_MOVE  6
+#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
 
 typedef struct