X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmap%2FMap.h;h=a985d8491f44928335ba06a618677d095da6079f;hb=2ccc2369d32fb680a3047519d79c17de34c4e10a;hp=ab0728b765ba8ec363c20d27f3a7e0b9e8e70454;hpb=ed792d6d00d822384d79d049e644e372f7c3b4cd;p=l2e.git

diff --git a/src/map/Map.h b/src/map/Map.h
index ab0728b..a985d84 100644
--- 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"
@@ -24,27 +25,26 @@ public:
 
 public:
 	const graphics::Sprite *Tileset() const { return tileset; }
+	Area *AreaAt(const geometry::Vector<int> &);
 	const Area *AreaAt(const geometry::Vector<int> &) const;
+	Tile *TileAt(const geometry::Vector<int> &);
 	const Tile *TileAt(const geometry::Vector<int> &) const;
 	Trigger *TriggerAt(const geometry::Vector<int> &);
+	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 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;
+	SDL_Surface *battlebg;
 	Area *areas;
 	int numAreas;
 	Trigger *triggers;