#include "battle/Monster.h"
#include "battle/PartyLayout.h"
#include "geometry/Point.h"
+#include "graphics/Frame.h"
#include "graphics/Sprite.h"
#include "sdl/InitImage.h"
#include "sdl/InitScreen.h"
using battle::Monster;
using battle::PartyLayout;
using geometry::Point;
+using graphics::Frame;
using graphics::Sprite;
using sdl::InitImage;
using sdl::InitScreen;
InitScreen screen(width, height);
// temporary test data
- SDL_Surface *bg(SDL_CreateRGBSurface(0, width, height, 32, 0xFF000000, 0xFF0000, 0xFF00, 0xFF));
- SDL_FillRect(bg, 0, SDL_MapRGB(bg->format, 0xFF, 0xFF, 0xFF));
- SDL_Rect r;
- r.x = 1;
- r.y = 1;
- r.w = width - 2;
- r.h = height - 2;
- SDL_FillRect(bg, &r, SDL_MapRGB(bg->format, 0, 0, 0));
+ SDL_Surface *bg(IMG_Load("test-data/battle-bg.png"));
PartyLayout monstersLayout;
monstersLayout.AddPosition(Point<Uint8>(50, 100));
- monstersLayout.AddPosition(Point<Uint8>(100, 100));
+ monstersLayout.AddPosition(Point<Uint8>(100, 108));
monstersLayout.AddPosition(Point<Uint8>(150, 100));
- monstersLayout.AddPosition(Point<Uint8>(200, 100));
+ monstersLayout.AddPosition(Point<Uint8>(200, 108));
PartyLayout heroesLayout;
heroesLayout.AddPosition(Point<Uint8>(27, 219));
heroesLayout.AddPosition(Point<Uint8>(104, 227));
heroesLayout.AddPosition(Point<Uint8>(66, 238));
heroesLayout.AddPosition(Point<Uint8>(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);
+
+ SDL_Surface *monsterImg(IMG_Load("test-data/monster.png"));
+ Sprite dummySprite(monsterImg, 96, 96);
Monster monster;
monster.SetSprite(&dummySprite);
+
+ SDL_Surface *heroImg(IMG_Load("test-data/hero.png"));
+ Sprite heroSprite(heroImg, 96, 96);
Hero hero;
hero.SetName("Name");
hero.SetLevel(34);
- hero.SetSprite(&dummySprite);
+ hero.SetSprite(&heroSprite);
hero.SetMaxHealth(100);
hero.SetHealth(50);
hero.SetMaxMana(100);
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);
- BattleState *battleState(new BattleState(bg, monstersLayout, heroesLayout, &attackIconsSprite, &moveIconsSprite));
+ BattleState *battleState(new BattleState(bg, monstersLayout, heroesLayout, &attackIconsSprite, &moveIconsSprite, &heroTagFrame, &activeHeroTagFrame));
battleState->AddMonster(monster);
battleState->AddMonster(monster);
battleState->AddMonster(monster);