X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmain.cpp;h=97a93994a634c8bcd018fb75803fcbc656d175a4;hb=185c6c79f8ba30981aad4e1d66f98143a344b95e;hp=4ea0e0e3f067c530f33a4ffa17721ddb6d84d980;hpb=c0860451b5fd681c3b3b8d985e8831276bbd917f;p=l2e.git

diff --git a/src/main.cpp b/src/main.cpp
index 4ea0e0e..97a9399 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -12,6 +12,9 @@
 #include "battle/Monster.h"
 #include "battle/PartyLayout.h"
 #include "geometry/Point.h"
+#include "graphics/Font.h"
+#include "graphics/Frame.h"
+#include "graphics/Gauge.h"
 #include "graphics/Sprite.h"
 #include "sdl/InitImage.h"
 #include "sdl/InitScreen.h"
@@ -29,6 +32,9 @@ using battle::Hero;
 using battle::Monster;
 using battle::PartyLayout;
 using geometry::Point;
+using graphics::Font;
+using graphics::Frame;
+using graphics::Gauge;
 using graphics::Sprite;
 using sdl::InitImage;
 using sdl::InitScreen;
@@ -49,44 +55,102 @@ 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>(150, 100));
-		monstersLayout.AddPosition(Point<Uint8>(200, 100));
+		monstersLayout.AddPosition(Point<Uint8>(88, 104));
+		monstersLayout.AddPosition(Point<Uint8>(128, 104));
+		monstersLayout.AddPosition(Point<Uint8>(168, 104));
+		monstersLayout.AddPosition(Point<Uint8>(208, 104));
 		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, 64, 64);
 		Monster monster;
 		monster.SetSprite(&dummySprite);
-		Hero hero;
-		hero.SetSprite(&dummySprite);
+
+		SDL_Surface *maximImg(IMG_Load("test-data/maxim.png"));
+		Sprite maximSprite(maximImg, 64, 64);
+		Hero maxim;
+		maxim.SetName("Maxim");
+		maxim.SetLevel(1);
+		maxim.SetSprite(&maximSprite);
+		maxim.SetMaxHealth(33);
+		maxim.SetHealth(33);
+		maxim.SetMaxMana(20);
+		maxim.SetMana(20);
+		maxim.SetIP(0);
+
+		SDL_Surface *selanImg(IMG_Load("test-data/selan.png"));
+		Sprite selanSprite(selanImg, 64, 64);
+		Hero selan;
+		selan.SetName("Selan");
+		selan.SetLevel(1);
+		selan.SetSprite(&selanSprite);
+		selan.SetMaxHealth(28);
+		selan.SetHealth(28);
+		selan.SetMaxMana(23);
+		selan.SetMana(23);
+		selan.SetIP(0);
+
+		SDL_Surface *guyImg(IMG_Load("test-data/guy.png"));
+		Sprite guySprite(guyImg, 64, 64);
+		Hero guy;
+		guy.SetName("Guy");
+		guy.SetLevel(1);
+		guy.SetSprite(&guySprite);
+		guy.SetMaxHealth(38);
+		guy.SetHealth(38);
+		guy.SetMaxMana(0);
+		guy.SetMana(0);
+		guy.SetIP(0);
+
+		SDL_Surface *dekarImg(IMG_Load("test-data/dekar.png"));
+		Sprite dekarSprite(dekarImg, 64, 64);
+		Hero dekar;
+		dekar.SetName("Dekar");
+		dekar.SetLevel(1);
+		dekar.SetSprite(&dekarSprite);
+		dekar.SetMaxHealth(38);
+		dekar.SetHealth(38);
+		dekar.SetMaxMana(0);
+		dekar.SetMana(0);
+		dekar.SetIP(0);
 
 		SDL_Surface *attackIcons(IMG_Load("test-data/attack-type-icons.png"));
 		Sprite attackIconsSprite(attackIcons, 32, 32);
+		SDL_Surface *moveIcons(IMG_Load("test-data/move-icons.png"));
+		Sprite moveIconsSprite(moveIcons, 32, 32);
+		SDL_Surface *heroTagSprites(IMG_Load("test-data/hero-tag-sprites.png"));
+		Sprite heroTagSprite(heroTagSprites, 32, 16);
+		SDL_Surface *numbers(IMG_Load("test-data/numbers.png"));
+		Sprite numbersSprite(numbers, 16, 16);
+		Font heroTagFont(&numbersSprite);
+		SDL_Surface *tagFrames(IMG_Load("test-data/tag-frames.png"));
+		Frame heroTagFrame(tagFrames, 16, 16, 1, 1, 0, 33);
+		Frame activeHeroTagFrame(tagFrames, 16, 16);
+
+		SDL_Surface *gauges(IMG_Load("test-data/gauges.png"));
+		Gauge healthGauge(gauges, 0, 16, 0, 0, 16, 6, 1, 6);
+		Gauge manaGauge(gauges, 0, 32, 0, 0, 16, 6, 1, 6);
+		Gauge ikariGauge(gauges, 0, 48, 0, 0, 16, 6, 1, 6);
+
+		SDL_Surface *selectFrameImg(IMG_Load("test-data/select-frame.png"));
+		Frame selectFrame(selectFrameImg, 16, 16);
 
-		BattleState *battleState(new BattleState(bg, monstersLayout, heroesLayout, &attackIconsSprite));
+		// TODO: create a container for all the battle resources
+		BattleState *battleState(new BattleState(bg, monstersLayout, heroesLayout, &attackIconsSprite, &moveIconsSprite, &heroTagFrame, &activeHeroTagFrame, &healthGauge, &manaGauge, &ikariGauge, &heroTagSprite, &heroTagFont, &selectFrame));
 		battleState->AddMonster(monster);
 		battleState->AddMonster(monster);
 		battleState->AddMonster(monster);
 		battleState->AddMonster(monster);
-		battleState->AddHero(hero);
-		battleState->AddHero(hero);
-		battleState->AddHero(hero);
-		battleState->AddHero(hero);
+		battleState->AddHero(maxim);
+		battleState->AddHero(selan);
+		battleState->AddHero(guy);
+		battleState->AddHero(dekar);
 		Application app(&screen, battleState);
 		app.Buttons().MapKey(SDLK_w, Input::PAD_UP);
 		app.Buttons().MapKey(SDLK_d, Input::PAD_RIGHT);