X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmain.cpp;h=e1969307c93ff83dff5c88adfda6f2066c1e0e2d;hb=8f54789ae7d974035b9103982c38e1714a15728b;hp=3719a8de6e452e7850c5c8493c0aa480081a4f1e;hpb=912fc1a30dc8ec2ab782256d32e517206c87a04c;p=l2e.git

diff --git a/src/main.cpp b/src/main.cpp
index 3719a8d..e196930 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -92,16 +92,8 @@ int main(int argc, char **argv) {
 
 		// temporary test data
 		SDL_Surface *bg(IMG_Load("test-data/battle-bg.png"));
-		PartyLayout monstersLayout;
-		monstersLayout.AddPosition(Vector<Uint8>(88, 88));
-		monstersLayout.AddPosition(Vector<Uint8>(128, 88));
-		monstersLayout.AddPosition(Vector<Uint8>(168, 88));
-		monstersLayout.AddPosition(Vector<Uint8>(208, 88));
-		PartyLayout heroesLayout;
-		heroesLayout.AddPosition(Vector<Uint8>(48, 136));
-		heroesLayout.AddPosition(Vector<Uint8>(128, 136));
-		heroesLayout.AddPosition(Vector<Uint8>(80, 152));
-		heroesLayout.AddPosition(Vector<Uint8>(160, 152));
+		PartyLayout monstersLayout(*intp.GetPartyLayout("monstersLayout"));
+		PartyLayout heroesLayout(*intp.GetPartyLayout("heroesLayout"));
 
 		Monster monster(*intp.GetMonster("lizard"));
 		Hero maxim(*intp.GetHero("maxim"));
@@ -111,63 +103,17 @@ int main(int argc, char **argv) {
 
 		battle::Resources battleRes;
 
-		SDL_Surface *swapCursorImg(IMG_Load("test-data/swap-cursor.png"));
-		Sprite swapCursorSprite(swapCursorImg, 32, 32);
-		battleRes.swapCursor = &swapCursorSprite;
-		SDL_Surface *attackIconsImg(IMG_Load("test-data/attack-type-icons.png"));
-		Sprite attackIconsSprite(attackIconsImg, 32, 32);
-		battleRes.attackIcons = &attackIconsSprite;
-		SDL_Surface *attackChoiceIconsImg(IMG_Load("test-data/attack-choice-icons.png"));
-		Sprite attackChoiceIconsSprite(attackChoiceIconsImg, 16, 16);
-		battleRes.attackChoiceIcons = &attackChoiceIconsSprite;
-		SDL_Surface *moveIconsImg(IMG_Load("test-data/move-icons.png"));
-		Sprite moveIconsSprite(moveIconsImg, 32, 32);
-		battleRes.moveIcons = &moveIconsSprite;
-
-		SDL_Surface *titleFrameImg(IMG_Load("test-data/title-frame.png"));
-		Frame titleFrame(titleFrameImg, 16, 16);
-		battleRes.titleFrame = &titleFrame;
-
-		SDL_Surface *largeFontImg(IMG_Load("test-data/large-font.png"));
-		Sprite largeFontSprite(largeFontImg, 16, 32);
-		Font largeFont(&largeFontSprite, 0, -2);
-		battleRes.titleFont = &largeFont;
-
-		ComplexAnimation numberAnimationPrototype(0, framerate);
-		numberAnimationPrototype.AddFrame(0, 0);
-		numberAnimationPrototype.AddFrame(0, 0, Vector<int>(0, -26));
-		numberAnimationPrototype.AddFrame(0, 0, Vector<int>(0, -42));
-		numberAnimationPrototype.AddFrame(0, 0, Vector<int>(0, -48));
-		numberAnimationPrototype.AddFrame(0, 0, Vector<int>(0, -42));
-		numberAnimationPrototype.AddFrame(0, 0, Vector<int>(0, -26));
-		numberAnimationPrototype.AddFrame(0, 0);
-		numberAnimationPrototype.AddFrame(0, 0, Vector<int>(0, -12));
-		numberAnimationPrototype.AddFrame(0, 0, Vector<int>(0, -20));
-		numberAnimationPrototype.AddFrame(0, 0, Vector<int>(0, -24));
-		numberAnimationPrototype.AddFrame(0, 0, Vector<int>(0, -20));
-		numberAnimationPrototype.AddFrame(0, 0, Vector<int>(0, -12));
-		numberAnimationPrototype.AddFrame(0, 0);
-		numberAnimationPrototype.AddFrame(0, 0, Vector<int>(0, -6));
-		numberAnimationPrototype.AddFrame(0, 0, Vector<int>(0, -10));
-		numberAnimationPrototype.AddFrame(0, 0, Vector<int>(0, -12));
-		numberAnimationPrototype.AddFrame(0, 0, Vector<int>(0, -10));
-		numberAnimationPrototype.AddFrame(0, 0, Vector<int>(0, -6));
-		numberAnimationPrototype.AddFrames(0, 0, Vector<int>(), 14);
-		numberAnimationPrototype.AddFrame(0, 0, Vector<int>(0, -36));
-		numberAnimationPrototype.AddFrame(0, 0, Vector<int>(0, -32));
-		numberAnimationPrototype.AddFrame(0, 0, Vector<int>(0, -18));
-		battleRes.numberAnimationPrototype = &numberAnimationPrototype;
-
-		SDL_Surface *bigNumbersImg(IMG_Load("test-data/big-numbers.png"));
-		Sprite bigNumbersSprite(bigNumbersImg, 16, 32);
-		battleRes.bigNumberSprite = &bigNumbersSprite;
-		SDL_Surface *bigGreenNumbersImg(IMG_Load("test-data/big-green-numbers.png"));
-		Sprite bigGreenNumbersSprite(bigGreenNumbersImg, 16, 32);
-		battleRes.greenNumberSprite = &bigGreenNumbersSprite;
-
-		SDL_Surface *heroTagImg(IMG_Load("test-data/hero-tag-sprites.png"));
-		Sprite heroTagSprite(heroTagImg, 32, 16);
-		battleRes.heroTagLabels = &heroTagSprite;
+		battleRes.swapCursor = intp.GetSprite("swapCursor");
+		battleRes.attackIcons = intp.GetSprite("attackIcons");
+		battleRes.attackChoiceIcons = intp.GetSprite("attackChoiceIcons");
+		battleRes.moveIcons = intp.GetSprite("moveIcons");
+		battleRes.titleFrame = intp.GetFrame("titleFrame");
+		battleRes.titleFont = intp.GetFont("largeFont");
+		battleRes.numberAnimationPrototype = intp.GetAnimation("numberAnimationPrototype");
+		battleRes.bigNumberSprite = intp.GetSprite("bigNumbers");
+		battleRes.greenNumberSprite = intp.GetSprite("bigGreenNumbers");
+
+		battleRes.heroTagLabels = intp.GetSprite("heroTagLabels");
 		battleRes.levelLabelCol = 0;
 		battleRes.levelLabelRow = 0;
 		battleRes.healthLabelCol = 0;
@@ -179,20 +125,11 @@ int main(int argc, char **argv) {
 		battleRes.ikariLabelCol = 0;
 		battleRes.ikariLabelRow = 4;
 
-		SDL_Surface *numbersImg(IMG_Load("test-data/numbers.png"));
-		Sprite numbersSprite(numbersImg, 16, 16);
-		Font heroTagFont(&numbersSprite, 0, -3);
-		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 *smallTagFrameImg(IMG_Load("test-data/small-tag-frame.png"));
-		Frame smallTagFrame(smallTagFrameImg, 8, 16);
-		battleRes.smallHeroTagFrame = &smallTagFrame;
-		Frame lastSmallTagFrame(smallTagFrameImg, 8, 16, 1, 1, 0, 33);
-		battleRes.lastSmallHeroTagFrame = &lastSmallTagFrame;
+		battleRes.heroTagFont = intp.GetFont("heroTagFont");
+		battleRes.heroTagFrame = intp.GetFrame("heroTagFrame");
+		battleRes.activeHeroTagFrame = intp.GetFrame("activeHeroTagFrame");
+		battleRes.smallHeroTagFrame = intp.GetFrame("smallHeroTagFrame");
+		battleRes.lastSmallHeroTagFrame = intp.GetFrame("lastSmallHeroTagFrame");
 		battleRes.heroesBgColor = SDL_MapRGB(screen.Screen()->format, 0x18, 0x28, 0x31);
 
 		SDL_Surface *gauges(IMG_Load("test-data/gauges.png"));