X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmain.cpp;h=ab02016cff4d67511af6f986f595067c58dfd875;hb=cf20874f973521e84fc2aaa6cd47c56a278d9de7;hp=807784300ae1c5fe416ea0c44f058e3c7596ca66;hpb=bfcf2f4de43077249b82af03a0e1b8281b8490e3;p=l2e.git

diff --git a/src/main.cpp b/src/main.cpp
index 8077843..ab02016 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -12,6 +12,8 @@
 #include "battle/Monster.h"
 #include "battle/PartyLayout.h"
 #include "geometry/Point.h"
+#include "graphics/Frame.h"
+#include "graphics/Gauge.h"
 #include "graphics/Sprite.h"
 #include "sdl/InitImage.h"
 #include "sdl/InitScreen.h"
@@ -29,6 +31,8 @@ using battle::Hero;
 using battle::Monster;
 using battle::PartyLayout;
 using geometry::Point;
+using graphics::Frame;
+using graphics::Gauge;
 using graphics::Sprite;
 using sdl::InitImage;
 using sdl::InitScreen;
@@ -51,10 +55,10 @@ int main(int argc, char **argv) {
 		// temporary test data
 		SDL_Surface *bg(IMG_Load("test-data/battle-bg.png"));
 		PartyLayout monstersLayout;
-		monstersLayout.AddPosition(Point<Uint8>(50, 100));
-		monstersLayout.AddPosition(Point<Uint8>(100, 108));
-		monstersLayout.AddPosition(Point<Uint8>(150, 100));
-		monstersLayout.AddPosition(Point<Uint8>(200, 108));
+		monstersLayout.AddPosition(Point<Uint8>(104, 109));
+		monstersLayout.AddPosition(Point<Uint8>(140, 118));
+		monstersLayout.AddPosition(Point<Uint8>(176, 109));
+		monstersLayout.AddPosition(Point<Uint8>(212, 118));
 		PartyLayout heroesLayout;
 		heroesLayout.AddPosition(Point<Uint8>(27, 219));
 		heroesLayout.AddPosition(Point<Uint8>(104, 227));
@@ -62,12 +66,12 @@ int main(int argc, char **argv) {
 		heroesLayout.AddPosition(Point<Uint8>(143, 246));
 
 		SDL_Surface *monsterImg(IMG_Load("test-data/monster.png"));
-		Sprite dummySprite(monsterImg, 96, 96);
+		Sprite dummySprite(monsterImg, 64, 64);
 		Monster monster;
 		monster.SetSprite(&dummySprite);
 
 		SDL_Surface *heroImg(IMG_Load("test-data/hero.png"));
-		Sprite heroSprite(heroImg, 96, 96);
+		Sprite heroSprite(heroImg, 64, 64);
 		Hero hero;
 		hero.SetName("Name");
 		hero.SetLevel(34);
@@ -75,15 +79,23 @@ int main(int argc, char **argv) {
 		hero.SetMaxHealth(100);
 		hero.SetHealth(50);
 		hero.SetMaxMana(100);
-		hero.SetMana(66);
-		hero.SetIP(160);
+		hero.SetMana(100);
+		hero.SetIP(255);
 
 		SDL_Surface *attackIcons(IMG_Load("test-data/attack-type-icons.png"));
 		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, 16, 16, 1, 1, 0, 33);
+		Frame activeHeroTagFrame(tagFrames, 16, 16);
 
-		BattleState *battleState(new BattleState(bg, monstersLayout, heroesLayout, &attackIconsSprite, &moveIconsSprite));
+		SDL_Surface *gauges(IMG_Load("test-data/gauges.png"));
+		Gauge healthGauge(gauges, 0, 16, 0, 0, 16, 6, 1, 6);
+		Gauge manaGauge(gauges, 0, 32, 0, 0, 16, 6, 1, 6);
+		Gauge ikariGauge(gauges, 0, 48, 0, 0, 16, 6, 1, 6);
+
+		BattleState *battleState(new BattleState(bg, monstersLayout, heroesLayout, &attackIconsSprite, &moveIconsSprite, &heroTagFrame, &activeHeroTagFrame, &healthGauge, &manaGauge, &ikariGauge));
 		battleState->AddMonster(monster);
 		battleState->AddMonster(monster);
 		battleState->AddMonster(monster);