X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmain.cpp;h=807784300ae1c5fe416ea0c44f058e3c7596ca66;hb=bfcf2f4de43077249b82af03a0e1b8281b8490e3;hp=bd8ff4a48c0850c58232857a6b439d23bdff3853;hpb=9413020156a8eecdb56879510d1216e894a9331f;p=l2e.git

diff --git a/src/main.cpp b/src/main.cpp
index bd8ff4a..8077843 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -49,33 +49,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, 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);