avoid map reading crash, arbitrary tile sizes, enable new maps

1 files changed, 2 insertions, 16 deletions

diff --git a/src/game-server/map.cpp b/src/game-server/map.cpp
index 8f6dacc7..238c0837 100644
--- a/src/game-server/map.cpp
+++ b/src/game-server/map.cpp
@@ -45,23 +45,9 @@ bool Location::operator< (const Location &loc) const
    return tile->Fcost > loc.tile->Fcost;
 }
 
-
-Map::Map():
-    mWidth(0), mHeight(0),
-    tileWidth(32), tileHeight(32),
-    onClosedList(1), onOpenList(2)
-{
-    mMetaTiles = new MetaTile[mWidth * mHeight];
-    for (int i=0; i < NB_BLOCKTYPES; i++)
-    {
-        mOccupation[i] = new int[mWidth * mHeight];
-        memset(mOccupation[i], 0, mWidth * mHeight * sizeof(int));
-    }
-}
-
-Map::Map(int width, int height):
+Map::Map(int width, int height, int twidth, int theight):
     mWidth(width), mHeight(height),
-    tileWidth(32), tileHeight(32),
+    tileWidth(twidth), tileHeight(theight),
     onClosedList(1), onOpenList(2)
 {
     mMetaTiles = new MetaTile[mWidth * mHeight];