X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2FSmallHeroTag.cpp;h=408be3bdb547794760bd5c322ac207cb1322df8a;hb=087783315ac5955c17bb3b051c9351f321653df6;hp=265f230642e58d36e3b53c78be83863221c65067;hpb=cc3d698b8c1ad09d7a3f9e3f28bc84e0ac1735ea;p=l2e.git diff --git a/src/battle/SmallHeroTag.cpp b/src/battle/SmallHeroTag.cpp index 265f230..408be3b 100644 --- a/src/battle/SmallHeroTag.cpp +++ b/src/battle/SmallHeroTag.cpp @@ -1,19 +1,20 @@ #include "SmallHeroTag.h" #include "BattleState.h" -#include "../geometry/Vector.h" +#include "../math/Vector.h" #include "../graphics/Font.h" #include "../graphics/Frame.h" #include "../graphics/Gauge.h" +#include "../math/Vector.h" -using geometry::Vector; +using math::Vector; using graphics::Font; using graphics::Frame; using graphics::Sprite; namespace battle { -void SmallHeroTag::Render(SDL_Surface *screen, int width, int height, const geometry::Vector &position) const { +void SmallHeroTag::Render(SDL_Surface *screen, int width, int height, const math::Vector &position) const { const Resources &r(battle->Res()); const Frame *frame((index == battle->MaxHeroes() - 1) ? r.lastSmallHeroTagFrame : r.smallHeroTagFrame); const Font *font(r.normalFont); @@ -21,7 +22,7 @@ void SmallHeroTag::Render(SDL_Surface *screen, int width, int height, const geom frame->Draw(screen, position, width, height); - if (battle->HeroPositionOccupied(index)) { + if (battle->GetBattle().HeroPositionOccupied(index)) { const Hero &hero(battle->HeroAt(index)); int gaugeWidth(width - 2 * frame->BorderWidth() - labels->Width());