X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmain.cpp;h=29c08a5fbda46a2ea20acd511af27761c0db3add;hb=b6502719f0f02bdb4fc39aa66fa4a369ea583036;hp=c8668dca1145f8c3da24bca4d50691be768b9c02;hpb=4e3c919944d011835702f5a63f65a7bb395d3eab;p=l2e.git

diff --git a/src/main.cpp b/src/main.cpp
index c8668dc..29c08a5 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -11,6 +11,7 @@
 #include "battle/Hero.h"
 #include "battle/Monster.h"
 #include "battle/PartyLayout.h"
+#include "battle/Resources.h"
 #include "geometry/Point.h"
 #include "graphics/Font.h"
 #include "graphics/Frame.h"
@@ -120,25 +121,40 @@ int main(int argc, char **argv) {
 		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);
+		battle::Resources battleRes;
+
+		SDL_Surface *attackIconsImg(IMG_Load("test-data/attack-type-icons.png"));
+		Sprite attackIconsSprite(attackIconsImg, 32, 32);
+		battleRes.attackIcons = &attackIconsSprite;
+		SDL_Surface *moveIconsImg(IMG_Load("test-data/move-icons.png"));
+		Sprite moveIconsSprite(moveIconsImg, 32, 32);
+		battleRes.moveIcons = &moveIconsSprite;
+		SDL_Surface *heroTagImg(IMG_Load("test-data/hero-tag-sprites.png"));
+		Sprite heroTagSprite(heroTagImg, 32, 16);
+		battleRes.heroTagLabels = &heroTagSprite;
+		SDL_Surface *numbersImg(IMG_Load("test-data/numbers.png"));
+		Sprite numbersSprite(numbersImg, 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);
+		battleRes.heroTagFont = &heroTagFont;
+		SDL_Surface *tagFramesImg(IMG_Load("test-data/tag-frames.png"));
+		Frame heroTagFrame(tagFramesImg, 16, 16, 1, 1, 0, 33);
+		battleRes.heroTagFrame = &heroTagFrame;
+		Frame activeHeroTagFrame(tagFramesImg, 16, 16);
+		battleRes.activeHeroTagFrame = &activeHeroTagFrame;
 
 		SDL_Surface *gauges(IMG_Load("test-data/gauges.png"));
 		Gauge healthGauge(gauges, 0, 16, 0, 0, 16, 6, 1, 6);
+		battleRes.healthGauge = &healthGauge;
 		Gauge manaGauge(gauges, 0, 32, 0, 0, 16, 6, 1, 6);
+		battleRes.manaGauge = &manaGauge;
 		Gauge ikariGauge(gauges, 0, 48, 0, 0, 16, 6, 1, 6);
+		battleRes.ikariGauge = &ikariGauge;
 
-		BattleState *battleState(new BattleState(bg, monstersLayout, heroesLayout, &attackIconsSprite, &moveIconsSprite, &heroTagFrame, &activeHeroTagFrame, &healthGauge, &manaGauge, &ikariGauge, &heroTagSprite, &heroTagFont));
+		SDL_Surface *selectFrameImg(IMG_Load("test-data/select-frame.png"));
+		Frame selectFrame(selectFrameImg, 16, 16);
+		battleRes.selectFrame = &selectFrame;
+
+		BattleState *battleState(new BattleState(bg, monstersLayout, heroesLayout, &battleRes));
 		battleState->AddMonster(monster);
 		battleState->AddMonster(monster);
 		battleState->AddMonster(monster);