X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmain.cpp;h=71a4afbd72287ef6934c28af54fc73c0db0c70cd;hb=0ef4dc19f03955b82d22330342acb179cf12b551;hp=ab02016cff4d67511af6f986f595067c58dfd875;hpb=cf20874f973521e84fc2aaa6cd47c56a278d9de7;p=l2e.git diff --git a/src/main.cpp b/src/main.cpp index ab02016..71a4afb 100644 --- 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(104, 109)); - monstersLayout.AddPosition(Point(140, 118)); - monstersLayout.AddPosition(Point(176, 109)); - monstersLayout.AddPosition(Point(212, 118)); + monstersLayout.AddPosition(Point(88, 104)); + monstersLayout.AddPosition(Point(128, 104)); + monstersLayout.AddPosition(Point(168, 104)); + monstersLayout.AddPosition(Point(208, 104)); PartyLayout heroesLayout; heroesLayout.AddPosition(Point(27, 219)); heroesLayout.AddPosition(Point(104, 227)); @@ -86,6 +86,8 @@ 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 *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);