X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmap%2FMap.h;h=5eacc7b9b08e15ba2c3d4968debc6793a97811b0;hb=0ad5ca97b5df217329bc319d62564a9f46ba11d7;hp=dd0185cdeacca199f5018f17826f4a429b7c2e86;hpb=c055b357c50dd871b49c38191a9d867ff42ea420;p=l2e.git

diff --git a/src/map/Map.h b/src/map/Map.h
index dd0185c..5eacc7b 100644
--- a/src/map/Map.h
+++ b/src/map/Map.h
@@ -24,25 +24,38 @@ 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 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; }
 
 private:
 	const graphics::Sprite *tileset;
+	SDL_Surface *battlebg;
 	Area *areas;
 	int numAreas;
 	Trigger *triggers;
 	int numTriggers;
+	Entity *entities;
+	int numEntities;
 	int width;
 
 };