added hero tag labels

[l2e.git] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index e2304337f11b3147340eed50338c0d71a718f892..71a4afbd72287ef6934c28af54fc73c0db0c70cd 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -55,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));
@@ -66,7 +66,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 +79,15 @@ 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 *tagFrames(IMG_Load("test-data/tag-frames.png"));
                Frame heroTagFrame(tagFrames, 16, 16, 1, 1, 0, 33);
                Frame activeHeroTagFrame(tagFrames, 16, 16);
@@ -95,7 +97,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));
                battleState->AddMonster(monster);
                battleState->AddMonster(monster);
                battleState->AddMonster(monster);