adjusted position calculation of battle ui

[l2e.git] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index 807784300ae1c5fe416ea0c44f058e3c7596ca66..767464bfe5f7be7b33799aa87cf4b38cc26c1f88 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -12,6 +12,7 @@
 #include "battle/Monster.h"
 #include "battle/PartyLayout.h"
 #include "geometry/Point.h"
+#include "graphics/Frame.h"
 #include "graphics/Sprite.h"
 #include "sdl/InitImage.h"
 #include "sdl/InitScreen.h"
@@ -29,6 +30,7 @@ using battle::Hero;
 using battle::Monster;
 using battle::PartyLayout;
 using geometry::Point;
+using graphics::Frame;
 using graphics::Sprite;
 using sdl::InitImage;
 using sdl::InitScreen;
@@ -82,8 +84,11 @@ int main(int argc, char **argv) {
                Sprite attackIconsSprite(attackIcons, 32, 32);
                SDL_Surface *moveIcons(IMG_Load("test-data/move-icons.png"));
                Sprite moveIconsSprite(moveIcons, 32, 32);
+               SDL_Surface *tagFrames(IMG_Load("test-data/tag-frames.png"));
+               Frame heroTagFrame(tagFrames, 8, 8, 1, 1, 17);
+               Frame activeHeroTagFrame(tagFrames, 8, 8);
 
-               BattleState *battleState(new BattleState(bg, monstersLayout, heroesLayout, &attackIconsSprite, &moveIconsSprite));
+               BattleState *battleState(new BattleState(bg, monstersLayout, heroesLayout, &attackIconsSprite, &moveIconsSprite, &heroTagFrame, &activeHeroTagFrame));
                battleState->AddMonster(monster);
                battleState->AddMonster(monster);
                battleState->AddMonster(monster);