renamed namespace geometry -> math

[l2e.git] / src / battle / BattleState.h

diff --git a/src/battle/BattleState.h b/src/battle/BattleState.h
index 1c994e4f88a664c2d572173fd79c156d1daf0687..525889591d5847e8088e0c5753d28f67e6d7cfc6 100644 (file)
--- a/src/battle/BattleState.h
+++ b/src/battle/BattleState.h
@@ -15,7 +15,7 @@
 #include "../common/GameConfig.h"
 #include "../common/fwd.h"
 #include "../common/Stats.h"
-#include "../geometry/Vector.h"
+#include "../math/Vector.h"
 #include "../graphics/Animation.h"
 #include "../graphics/fwd.h"
 #include "../graphics/Menu.h"
@@ -76,7 +76,7 @@ public:
        const Monster &MonsterAt(int index) const { assert(index >= 0 && index < NumHeroes()); return monsters[index]; }
 
        const HeroTag &HeroTagAt(int index) const { assert(index >= 0 && index < NumHeroes()); return heroTags[index]; }
-       const geometry::Vector<int> &HeroTagPositionAt(int index) const { assert(index >= 0 && index < NumHeroes()); return heroTagPositions[index]; }
+       const math::Vector<int> &HeroTagPositionAt(int index) const { assert(index >= 0 && index < NumHeroes()); return heroTagPositions[index]; }
 
        Capsule &GetCapsule() { return capsule; }
 
@@ -122,21 +122,21 @@ public:
        bool Defeat() const;
 
 public:
-       geometry::Vector<int> CalculateScreenOffset(SDL_Surface *screen) const {
-               return geometry::Vector<int>(
+       math::Vector<int> CalculateScreenOffset(SDL_Surface *screen) const {
+               return math::Vector<int>(
                                (screen->w - background->w) / 2,
                                (screen->h - background->h) / 2);
        }
        int Width() const { return background->w; }
        int Height() const { return background->h; }
-       geometry::Vector<int> Size() const { return geometry::Vector<int>(Width(), Height()); }
+       math::Vector<int> Size() const { return math::Vector<int>(Width(), Height()); }
 
-       void RenderBackground(SDL_Surface *screen, const geometry::Vector<int> &offset);
-       void RenderMonsters(SDL_Surface *screen, const geometry::Vector<int> &offset);
-       void RenderHeroes(SDL_Surface *screen, const geometry::Vector<int> &offset);
-       void RenderCapsule(SDL_Surface *screen, const geometry::Vector<int> &offset);
-       void RenderHeroTags(SDL_Surface *screen, const geometry::Vector<int> &offset);
-       void RenderSmallHeroTags(SDL_Surface *screen, const geometry::Vector<int> &offset);
+       void RenderBackground(SDL_Surface *screen, const math::Vector<int> &offset);
+       void RenderMonsters(SDL_Surface *screen, const math::Vector<int> &offset);
+       void RenderHeroes(SDL_Surface *screen, const math::Vector<int> &offset);
+       void RenderCapsule(SDL_Surface *screen, const math::Vector<int> &offset);
+       void RenderHeroTags(SDL_Surface *screen, const math::Vector<int> &offset);
+       void RenderSmallHeroTags(SDL_Surface *screen, const math::Vector<int> &offset);
 
 private:
        virtual void OnEnterState(SDL_Surface *screen);
@@ -168,8 +168,8 @@ private:
        graphics::Menu<const common::Item *> itemMenu;
        HeroTag heroTags[4];
        SmallHeroTag smallHeroTags[4];
-       geometry::Vector<int> heroTagPositions[4];
-       geometry::Vector<int> smallHeroTagPositions[4];
+       math::Vector<int> heroTagPositions[4];
+       math::Vector<int> smallHeroTagPositions[4];
        Capsule capsule;
        int numHeroes;
        int activeHero;