X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmap%2FMap.h;h=a985d8491f44928335ba06a618677d095da6079f;hb=7c43158af1abf38fa896a442cb3c6d8a5bc630e7;hp=340c76c707d691951a68afbc8de283fd36aecac4;hpb=3565d69c463c39b05b4612ca3d3557139d91e310;p=l2e.git

diff --git a/src/map/Map.h b/src/map/Map.h
index 340c76c..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,21 +25,32 @@ public:
 
 public:
 	const graphics::Sprite *Tileset() const { return tileset; }
-	const Area &AreaAt(const geometry::Vector<int> &) const;
-	const Tile &TileAt(const geometry::Vector<int> &) const;
+	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; }
 
 	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(const Area *a, int num) { areas = a; numAreas = num; }
-	void SetWidth(int w) { width = w; }
+	static void CreateTypeDescription();
+	static void Construct(void *);
 
 private:
 	const graphics::Sprite *tileset;
-	const Area *areas;
+	SDL_Surface *battlebg;
+	Area *areas;
 	int numAreas;
+	Trigger *triggers;
+	int numTriggers;
+	Entity *entities;
+	int numEntities;
 	int width;
 
 };