X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmap%2FArea.h;h=5bdcf0121fdffeeedcc8d1a47b36081d6f493b29;hb=d97b7038c28058a76e7214e0dce0394fd8b67cff;hp=d9cc5d0d8784fc49d411a4ebb972a1913763af94;hpb=ed792d6d00d822384d79d049e644e372f7c3b4cd;p=l2e.git

diff --git a/src/map/Area.h b/src/map/Area.h
index d9cc5d0..5bdcf01 100644
--- a/src/map/Area.h
+++ b/src/map/Area.h
@@ -1,43 +1,63 @@
-/*
- * Area.h
- *
- *  Created on: Sep 26, 2012
- *      Author: holy
- */
-
 #ifndef MAP_AREA_H_
 #define MAP_AREA_H_
 
-#include "fwd.h"
-#include "../geometry/Vector.h"
-#include "../graphics/Sprite.h"
+namespace graphics {
+	class Sprite;
+}
+namespace map {
+	class Tile;
+}
+
+#include "../math/Vector.h"
 
 #include <SDL.h>
 
 namespace map {
 
+/// Defines a rectangular section of a map.
+/// Tiles are rendered ltr with a row break each width tiles.
+/// Missing tiles in the last row are possible but don't fool yourself.
 class Area {
 
+public:
+	static const int TYPE_ID = 601;
+
 public:
 	Area();
 	~Area() { }
 
 public:
+	/// Get the width in tiles.
 	int Width() const { return width; }
+	/// Get the height in tiles.
 	int Height() const { return numTiles / width + (numTiles % width ? 1 : 0); }
-	geometry::Vector<int> Size() const { return geometry::Vector<int>(Width(), Height()); }
-	const Tile *TileAt(const geometry::Vector<int> &) const;
+	/// Get the size in tiles.
+	math::Vector<int> Size() const { return math::Vector<int>(Width(), Height()); }
+	/// Get a tile by tile coordinates (not pixel coordinates!).
+	Tile *TileAt(const math::Vector<int> &);
+	const Tile *TileAt(const math::Vector<int> &) const;
+
+	/// Get the default battle background for this area.
+	SDL_Surface *BattleBackground() { return battlebg; }
+
+	void Render(
+			SDL_Surface *dest,
+			const graphics::Sprite *tileset,
+			const math::Vector<int> &offset,
+			unsigned int frame) const;
+	void RenderDebug(SDL_Surface *dest, const graphics::Sprite *tileset, const math::Vector<int> &offset) const;
 
-	void Render(SDL_Surface *dest, const graphics::Sprite *tileset, const geometry::Vector<int> &offset) const;
-	void RenderDebug(SDL_Surface *dest, const graphics::Sprite *tileset, const geometry::Vector<int> &offset) const;
+	static void CreateTypeDescription();
+	static void Construct(void *);
 
 // temporary setters
 public:
-	void SetTiles(const Tile *t, int num) { tiles = t; numTiles = num; }
+	void SetTiles(Tile *t, int num) { tiles = t; numTiles = num; }
 	void SetWidth(int w) { width = w; }
 
 private:
-	const Tile *tiles;
+	SDL_Surface *battlebg;
+	Tile *tiles;
 	int numTiles;
 	int width;
 
@@ -45,4 +65,4 @@ private:
 
 }
 
-#endif /* MAP_AREA_H_ */
+#endif