X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmap%2FArea.h;h=90f8f5fc7b3eaf0ab2b322882b1dfa5ff7ee33dc;hb=c49d46cbfbd7720627af2414e94963850fe8eed6;hp=d839e96c0688b3fbf91657bb152ef5e52a03db0d;hpb=1907ca03c5e865c4d398170042aa384c67ffff29;p=l2e.git diff --git a/src/map/Area.h b/src/map/Area.h index d839e96..90f8f5f 100644 --- a/src/map/Area.h +++ b/src/map/Area.h @@ -1,15 +1,8 @@ -/* - * 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 "../math/Vector.h" #include "../graphics/Sprite.h" #include @@ -34,16 +27,16 @@ public: /// Get the height in tiles. int Height() const { return numTiles / width + (numTiles % width ? 1 : 0); } /// Get the size in tiles. - geometry::Vector Size() const { return geometry::Vector(Width(), Height()); } + math::Vector Size() const { return math::Vector(Width(), Height()); } /// Get a tile by tile coordinates (not pixel coordinates!). - Tile *TileAt(const geometry::Vector &); - const Tile *TileAt(const geometry::Vector &) const; + Tile *TileAt(const math::Vector &); + const Tile *TileAt(const math::Vector &) 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 &offset) const; - void RenderDebug(SDL_Surface *dest, const graphics::Sprite *tileset, const geometry::Vector &offset) const; + void Render(SDL_Surface *dest, const graphics::Sprite *tileset, const math::Vector &offset) const; + void RenderDebug(SDL_Surface *dest, const graphics::Sprite *tileset, const math::Vector &offset) const; static void CreateTypeDescription(); static void Construct(void *);