X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmain.cpp;h=3ec99459014e6687127018e181b84b2c9b2bbea6;hb=d997e6743dfa0df245bc3f59ee97ecd63efb3c4f;hp=780b8c27b70c85e004d77d45e0a1a3b6e8358971;hpb=5ef75aee810e5a687fae24e3f95886241e36efda;p=l2e.git

diff --git a/src/main.cpp b/src/main.cpp
index 780b8c2..3ec9945 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -7,6 +7,11 @@
 
 #include "app/Application.h"
 #include "battle/BattleState.h"
+#include "battle/Hero.h"
+#include "battle/Monster.h"
+#include "battle/PartyLayout.h"
+#include "geometry/Point.h"
+#include "graphics/Sprite.h"
 #include "sdl/InitScreen.h"
 #include "sdl/InitSDL.h"
 
@@ -15,6 +20,11 @@
 
 using app::Application;
 using battle::BattleState;
+using battle::Hero;
+using battle::Monster;
+using battle::PartyLayout;
+using geometry::Point;
+using graphics::Sprite;
 using sdl::InitScreen;
 using sdl::InitSDL;
 
@@ -27,15 +37,47 @@ int main(int argc, char **argv) {
 	const int width = 800;
 	const int height = 480;
 
-	// temporary
+	// temporary test data
 	SDL_Surface *bg(SDL_CreateRGBSurface(0, width, height, 32, 0xFF000000, 0xFF0000, 0xFF00, 0xFF));
-	SDL_FillRect(bg, 0, SDL_MapRGB(bg->format, 0, 0, 0));
+	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));
+	PartyLayout monstersLayout;
+	monstersLayout.AddPosition(Point<Uint8>(50, 100));
+	monstersLayout.AddPosition(Point<Uint8>(100, 100));
+	monstersLayout.AddPosition(Point<Uint8>(150, 100));
+	monstersLayout.AddPosition(Point<Uint8>(200, 100));
+	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);
+	Monster monster;
+	monster.SetSprite(&dummySprite);
+	Hero hero;
+	hero.SetSprite(&dummySprite);
 
 	try {
 		InitSDL sdl;
 		InitScreen screen(width, height);
 
-		Application app(screen.Screen(), new BattleState(bg));
+		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();
 
 		return 0;