moved map data to maps.l2s

[l2e.git] / src / map / Map.h

diff --git a/src/map/Map.h b/src/map/Map.h
index 5eacc7b9b08e15ba2c3d4968debc6793a97811b0..a985d8491f44928335ba06a618677d095da6079f 100644 (file)
--- a/src/map/Map.h
+++ b/src/map/Map.h
@@ -8,6 +8,7 @@
 #ifndef MAP_MAP_H_
 #define MAP_MAP_H_
 
+#include "Entity.h"
 #include "fwd.h"
 #include "../geometry/Vector.h"
 #include "../graphics/fwd.h"
@@ -32,20 +33,14 @@ public:
        SDL_Surface *BattleBackgroundAt(const geometry::Vector<int> &);
        geometry::Vector<int> TileCoordinates(const geometry::Vector<int> &) const;
 
-       Entity **EntitiesBegin() { return &entities; }
-       Entity **EntitiesEnd() { return (&entities) + numEntities; }
+       Entity *EntitiesBegin() { return entities; }
+       Entity *EntitiesEnd() { return entities + numEntities; }
 
        void Render(SDL_Surface *dest, const geometry::Vector<int> &offset) const;
        void RenderDebug(SDL_Surface *dest, const geometry::Vector<int> &offset) const;
 
-// temporary setters
-public:
-       void SetTileset(const graphics::Sprite *t) { tileset = t; }
-       void SetBattleBackground(SDL_Surface *bg) { battlebg = bg; }
-       void SetAreas(Area *a, int num) { areas = a; numAreas = num; }
-       void SetTriggers(Trigger *t, int num) { triggers = t; numTriggers = num; }
-       void SetEntities(Entity *e, int num) { entities = e; numEntities = num; }
-       void SetWidth(int w) { width = w; }
+       static void CreateTypeDescription();
+       static void Construct(void *);
 
 private:
        const graphics::Sprite *tileset;