X-Git-Url: https://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmain.cpp;h=f12b2750b9a833dbca3fc25d8faa8d48f65330dd;hb=3ecf76abb280da727806262b4cac3472d94f9c5a;hp=bd8ff4a48c0850c58232857a6b439d23bdff3853;hpb=628b3a7276d0b330719e05504b23bafcf88f8fca;p=l2e.git

diff --git a/src/main.cpp b/src/main.cpp
index bd8ff4a..f12b275 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/Frame.h"
 #include "graphics/Sprite.h"
 #include "sdl/InitImage.h"
 #include "sdl/InitScreen.h"
@@ -29,6 +30,7 @@ using battle::Hero;
 using battle::Monster;
 using battle::PartyLayout;
 using geometry::Point;
+using graphics::Frame;
 using graphics::Sprite;
 using sdl::InitImage;
 using sdl::InitScreen;
@@ -49,33 +51,29 @@ int main(int argc, char **argv) {
 		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, 64, 64);
 		Hero hero;
 		hero.SetName("Name");
 		hero.SetLevel(34);
-		hero.SetSprite(&dummySprite);
+		hero.SetSprite(&heroSprite);
 		hero.SetMaxHealth(100);
 		hero.SetHealth(50);
 		hero.SetMaxMana(100);
@@ -86,8 +84,11 @@ 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 *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);