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

diff --git a/src/main.cpp b/src/main.cpp
index e196930..2f1c12a 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -132,85 +132,39 @@ int main(int argc, char **argv) {
 		battleRes.lastSmallHeroTagFrame = intp.GetFrame("lastSmallHeroTagFrame");
 		battleRes.heroesBgColor = SDL_MapRGB(screen.Screen()->format, 0x18, 0x28, 0x31);
 
-		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;
-
-		SDL_Surface *selectFrameImg(IMG_Load("test-data/select-frame.png"));
-		Frame selectFrame(selectFrameImg, 16, 16);
-		battleRes.selectFrame = &selectFrame;
-
-		SDL_Surface *normalFontImg(IMG_Load("test-data/normal-font.png"));
-		Sprite normalFontSprite(normalFontImg, 16, 16);
-		Font normalFont(&normalFontSprite, 0, -2);
-		battleRes.normalFont = &normalFont;
-
-		SDL_Surface *disabledFontImg(IMG_Load("test-data/disabled-font.png"));
-		Sprite disabledFontSprite(disabledFontImg, 16, 16);
-		Font disabledFont(&disabledFontSprite, 0, -2);
-		battleRes.disabledFont = &disabledFont;
-
-		SDL_Surface *handCursorImg(IMG_Load("test-data/cursor-hand.png"));
-		Sprite handCursorSprite(handCursorImg, 32, 32);
-		battleRes.menuCursor = &handCursorSprite;
-
-		SDL_Surface *targetingIconsImg(IMG_Load("test-data/targeting-icons.png"));
-		Sprite weaponTargetCursor(targetingIconsImg, 32, 32);
-		Sprite magicTargetCursor(targetingIconsImg, 32, 32, 0, 32);
-		Sprite itemTargetCursor(targetingIconsImg, 32, 32, 0, 64);
-		battleRes.weaponTargetCursor = &weaponTargetCursor;
-		battleRes.magicTargetCursor = &magicTargetCursor;
-		battleRes.itemTargetCursor = &itemTargetCursor;
-
-		Spell resetSpell;
-		resetSpell.SetName("Reset");
-		maxim.AddSpell(&resetSpell);
-		Spell strongSpell;
-		strongSpell.SetName("Strong");
-		strongSpell.SetCost(3);
-		strongSpell.SetUsableInBattle();
-		strongSpell.GetTargetingMode().TargetMultipleAllies();
-		maxim.AddSpell(&strongSpell);
-		selan.AddSpell(&strongSpell);
-		Spell strongerSpell;
-		strongerSpell.SetName("Stronger");
-		strongerSpell.SetCost(8);
-		strongerSpell.SetUsableInBattle();
-		strongerSpell.GetTargetingMode().TargetMultipleAllies();
-		maxim.AddSpell(&strongerSpell);
-		selan.AddSpell(&strongerSpell);
-		Spell championSpell;
-		championSpell.SetName("Champion");
-		championSpell.SetCost(16);
-		championSpell.SetUsableInBattle();
-		championSpell.GetTargetingMode().TargetMultipleAllies();
-		maxim.AddSpell(&championSpell);
-		selan.AddSpell(&championSpell);
-		Spell rallySpell;
-		rallySpell.SetName("Rally");
-		rallySpell.SetCost(10);
-		rallySpell.SetUsableInBattle();
-		rallySpell.GetTargetingMode().TargetMultipleAllies();
-		maxim.AddSpell(&rallySpell);
-		selan.AddSpell(&rallySpell);
-		Spell escapeSpell;
-		escapeSpell.SetName("Escape");
-		escapeSpell.SetCost(8);
-		selan.AddSpell(&escapeSpell);
-		Spell valorSpell;
-		valorSpell.SetName("Valor");
-		valorSpell.SetCost(30);
-		valorSpell.SetUsableInBattle();
-		valorSpell.GetTargetingMode().TargetMultipleAllies();
-		maxim.AddSpell(&valorSpell);
-		selan.AddSpell(&valorSpell);
+		battleRes.healthGauge = intp.GetGauge("healthGauge");
+		battleRes.manaGauge = intp.GetGauge("manaGauge");
+		battleRes.ikariGauge = intp.GetGauge("ikariGauge");
+
+		battleRes.selectFrame = intp.GetFrame("selectFrame");
+		battleRes.normalFont = intp.GetFont("normalFont");
+		battleRes.disabledFont = intp.GetFont("disabledFont");
+		battleRes.menuCursor = intp.GetSprite("handCursor");
+
+		battleRes.weaponTargetCursor = intp.GetSprite("weaponTargetCursor");
+		battleRes.magicTargetCursor = intp.GetSprite("magicTargetCursor");
+		battleRes.itemTargetCursor = intp.GetSprite("itemTargetCursor");
+
+		maxim.AddSpell(intp.GetSpell("resetSpell"));
+		Spell *strongSpell(intp.GetSpell("strongSpell"));
+		maxim.AddSpell(strongSpell);
+		selan.AddSpell(strongSpell);
+		Spell *strongerSpell(intp.GetSpell("strongerSpell"));
+		maxim.AddSpell(strongerSpell);
+		selan.AddSpell(strongerSpell);
+		Spell *championSpell(intp.GetSpell("championSpell"));
+		maxim.AddSpell(championSpell);
+		selan.AddSpell(championSpell);
+		Spell *rallySpell(intp.GetSpell("rallySpell"));
+		maxim.AddSpell(rallySpell);
+		selan.AddSpell(rallySpell);
+		selan.AddSpell(intp.GetSpell("escapeSpell"));
+		Spell *valorSpell(intp.GetSpell("valorSpell"));
+		maxim.AddSpell(valorSpell);
+		selan.AddSpell(valorSpell);
 
 		battleRes.spellMenuHeadline = "Please choose a spell.";
-		battleRes.spellMenuPrototype = Menu<const Spell *>(&normalFont, &disabledFont, &handCursorSprite, 9, 6, 8, 0, 2, 32, 2, ':');
+		battleRes.spellMenuPrototype = Menu<const Spell *>(intp.GetFont("normalFont"), intp.GetFont("disabledFont"), intp.GetSprite("handCursor"), 9, 6, 8, 0, 2, 32, 2, ':');
 
 		SDL_Surface *itemIcons(IMG_Load("test-data/item-icons.png"));
 		Sprite potionIcon(itemIcons, 16, 16);
@@ -279,7 +233,7 @@ int main(int argc, char **argv) {
 		battleRes.inventory = &inventory;
 
 		battleRes.itemMenuHeadline = "Please choose an item.";
-		battleRes.itemMenuPrototype = Menu<const common::Item *>(&normalFont, &disabledFont, &handCursorSprite, 15, 6, 8, 16, 1, 32, 2, ':');
+		battleRes.itemMenuPrototype = Menu<const common::Item *>(intp.GetFont("normalFont"), intp.GetFont("disabledFont"), intp.GetSprite("handCursor"), 15, 6, 8, 16, 1, 32, 2, ':');
 
 		SDL_Surface *swordAttackImg(IMG_Load("test-data/attack-sword.png"));
 		Sprite swordAttackSprite(swordAttackImg, 96, 96);
@@ -501,7 +455,7 @@ int main(int argc, char **argv) {
 
 		battleRes.ikariMenuHeadline = "Please choose equipment.";
 		battleRes.noEquipmentText = "No equip";
-		battleRes.ikariMenuPrototype = Menu<const Item *>(&normalFont, &disabledFont, &handCursorSprite, 12, 6, normalFont.CharHeight() / 2, normalFont.CharWidth(), 1, normalFont.CharWidth() * 2, 0, ':', 12, normalFont.CharWidth());
+		battleRes.ikariMenuPrototype = Menu<const Item *>(intp.GetFont("normalFont"), intp.GetFont("disabledFont"), intp.GetSprite("handCursor"), 12, 6, intp.GetFont("normalFont")->CharHeight() / 2, intp.GetFont("normalFont")->CharWidth(), 1, intp.GetFont("normalFont")->CharWidth() * 2, 0, ':', 12, intp.GetFont("normalFont")->CharWidth());
 
 		battleRes.escapeText = "Escapes.";