X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmain.cpp;h=850907f59552e356d1992f67d13f2435f6d1dd08;hb=ca31ddeab37eebaa2de5e5b1c94974fac06d418b;hp=e2304337f11b3147340eed50338c0d71a718f892;hpb=2e0bbc9fcc1cce3e1faeff85cc63de7f676e8077;p=l2e.git

diff --git a/src/main.cpp b/src/main.cpp
index e230433..850907f 100644
--- 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/Font.h"
 #include "graphics/Frame.h"
 #include "graphics/Gauge.h"
 #include "graphics/Sprite.h"
@@ -31,6 +32,7 @@ using battle::Hero;
 using battle::Monster;
 using battle::PartyLayout;
 using geometry::Point;
+using graphics::Font;
 using graphics::Frame;
 using graphics::Gauge;
 using graphics::Sprite;
@@ -55,10 +57,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));
@@ -66,7 +68,7 @@ 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);
 
@@ -79,13 +81,18 @@ int main(int argc, char **argv) {
 		hero.SetMaxHealth(100);
 		hero.SetHealth(50);
 		hero.SetMaxMana(100);
-		hero.SetMana(0);
+		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 *heroTagSprites(IMG_Load("test-data/hero-tag-sprites.png"));
+		Sprite heroTagSprite(heroTagSprites, 32, 16);
+		SDL_Surface *numbers(IMG_Load("test-data/numbers.png"));
+		Sprite numbersSprite(numbers, 16, 16);
+		Font heroTagFont(&numbersSprite);
 		SDL_Surface *tagFrames(IMG_Load("test-data/tag-frames.png"));
 		Frame heroTagFrame(tagFrames, 16, 16, 1, 1, 0, 33);
 		Frame activeHeroTagFrame(tagFrames, 16, 16);
@@ -95,7 +102,7 @@ int main(int argc, char **argv) {
 		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 *battleState(new BattleState(bg, monstersLayout, heroesLayout, &attackIconsSprite, &moveIconsSprite, &heroTagFrame, &activeHeroTagFrame, &healthGauge, &manaGauge, &ikariGauge, &heroTagSprite, &heroTagFont));
 		battleState->AddMonster(monster);
 		battleState->AddMonster(monster);
 		battleState->AddMonster(monster);