X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmain.cpp;h=c3d73cb93ec43b6c2cc1bac78498e58d283a3406;hb=d1df71f636f14fe2cb5b44b173e3d30bdc73521e;hp=767464bfe5f7be7b33799aa87cf4b38cc26c1f88;hpb=cccda573516f3bce30efbaba3fc20e4148d3cdc8;p=l2e.git

diff --git a/src/main.cpp b/src/main.cpp
index 767464b..c3d73cb 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -13,6 +13,7 @@
 #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"
@@ -31,6 +32,7 @@ using battle::Monster;
 using battle::PartyLayout;
 using geometry::Point;
 using graphics::Frame;
+using graphics::Gauge;
 using graphics::Sprite;
 using sdl::InitImage;
 using sdl::InitScreen;
@@ -53,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>(88, 104));
+		monstersLayout.AddPosition(Point<Uint8>(128, 104));
+		monstersLayout.AddPosition(Point<Uint8>(168, 104));
+		monstersLayout.AddPosition(Point<Uint8>(208, 104));
 		PartyLayout heroesLayout;
 		heroesLayout.AddPosition(Point<Uint8>(27, 219));
 		heroesLayout.AddPosition(Point<Uint8>(104, 227));
@@ -64,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);
@@ -77,18 +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, 8, 8, 1, 1, 17);
-		Frame activeHeroTagFrame(tagFrames, 8, 8);
+		Frame heroTagFrame(tagFrames, 16, 16, 1, 1, 0, 33);
+		Frame activeHeroTagFrame(tagFrames, 16, 16);
 
-		BattleState *battleState(new BattleState(bg, monstersLayout, heroesLayout, &attackIconsSprite, &moveIconsSprite, &heroTagFrame, &activeHeroTagFrame));
+		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);