X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmain.cpp;h=3ec99459014e6687127018e181b84b2c9b2bbea6;hb=d997e6743dfa0df245bc3f59ee97ecd63efb3c4f;hp=8f92a357dacb74830cd0350cc15ec55149c09c17;hpb=4a1816af30dcfe53181a25355bd51cc7b24a83f1;p=l2e.git diff --git a/src/main.cpp b/src/main.cpp index 8f92a35..3ec9945 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -7,6 +7,7 @@ #include "app/Application.h" #include "battle/BattleState.h" +#include "battle/Hero.h" #include "battle/Monster.h" #include "battle/PartyLayout.h" #include "geometry/Point.h" @@ -19,6 +20,7 @@ using app::Application; using battle::BattleState; +using battle::Hero; using battle::Monster; using battle::PartyLayout; using geometry::Point; @@ -49,21 +51,32 @@ int main(int argc, char **argv) { monstersLayout.AddPosition(Point(100, 100)); monstersLayout.AddPosition(Point(150, 100)); monstersLayout.AddPosition(Point(200, 100)); - SDL_Surface *white100(SDL_CreateRGBSurface(0, 100, 100, 32, 0xFF000000, 0xFF0000, 0xFF00, 0xFF)); - SDL_FillRect(white100, 0, SDL_MapRGB(bg->format, 0xFF, 0xFF, 0xFF)); - Sprite dummyMonsterSprite(white100, 100, 100); + PartyLayout heroesLayout; + heroesLayout.AddPosition(Point(27, 219)); + heroesLayout.AddPosition(Point(104, 227)); + heroesLayout.AddPosition(Point(66, 238)); + heroesLayout.AddPosition(Point(143, 246)); + SDL_Surface *white96(SDL_CreateRGBSurface(0, 96, 96, 32, 0xFF000000, 0xFF0000, 0xFF00, 0xFF)); + SDL_FillRect(white96, 0, SDL_MapRGB(bg->format, 0xFF, 0xFF, 0xFF)); + Sprite dummySprite(white96, 96, 96); Monster monster; - monster.SetSprite(&dummyMonsterSprite); + monster.SetSprite(&dummySprite); + Hero hero; + hero.SetSprite(&dummySprite); try { InitSDL sdl; InitScreen screen(width, height); - BattleState *battleState(new BattleState(bg, monstersLayout)); + BattleState *battleState(new BattleState(bg, monstersLayout, heroesLayout)); battleState->AddMonster(monster); battleState->AddMonster(monster); battleState->AddMonster(monster); battleState->AddMonster(monster); + battleState->AddHero(hero); + battleState->AddHero(hero); + battleState->AddHero(hero); + battleState->AddHero(hero); Application app(&screen, battleState); app.Run();