removed lazy fwd headers

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

diff --git a/src/map/Area.h b/src/map/Area.h
index 9da3083b3fb42f2a7db9f627327cbab9afdb66a4..6ea58374cee518584f8d7c8915a22f8e0ac62c05 100644 (file)
--- a/src/map/Area.h
+++ b/src/map/Area.h
@@ -1,16 +1,14 @@
-/*
- * 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>
 
@@ -21,6 +19,9 @@ namespace map {
 /// 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() { }
@@ -31,16 +32,16 @@ public:
        /// Get the height in tiles.
        int Height() const { return numTiles / width + (numTiles % width ? 1 : 0); }
        /// Get the size in tiles.
-       geometry::Vector<int> Size() const { return geometry::Vector<int>(Width(), Height()); }
+       math::Vector<int> Size() const { return math::Vector<int>(Width(), Height()); }
        /// Get a tile by tile coordinates (not pixel coordinates!).
-       Tile *TileAt(const geometry::Vector<int> &);
-       const Tile *TileAt(const geometry::Vector<int> &) const;
+       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 geometry::Vector<int> &offset) const;
-       void RenderDebug(SDL_Surface *dest, const graphics::Sprite *tileset, const geometry::Vector<int> &offset) const;
+       void Render(SDL_Surface *dest, const graphics::Sprite *tileset, const math::Vector<int> &offset) const;
+       void RenderDebug(SDL_Surface *dest, const graphics::Sprite *tileset, const math::Vector<int> &offset) const;
 
        static void CreateTypeDescription();
        static void Construct(void *);