split headers off of ikaris, items, and spells

[l2e.git] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index a1fbfaf940d9cb29d3e2b16a366bff96fa17e645..4280985185a5e8e144aa6f46d855c463dcf635d1 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -81,8 +81,10 @@ int main(int argc, char **argv) {
                InitImage image(IMG_INIT_PNG);
 
                ParsedSource source;
-               Parser parser("test-data/test.l2s", source);
-               parser.Parse();
+               Parser("test-data/test.l2s", source).Parse();
+               Parser("test-data/ikaris.l2s", source).Parse();
+               Parser("test-data/items.l2s", source).Parse();
+               Parser("test-data/spells.l2s", source).Parse();
                Interpreter intp(source);
                intp.ReadSource();
 
@@ -99,49 +101,7 @@ int main(int argc, char **argv) {
                Hero guy(*intp.GetHero("guy"));
                Hero dekar(*intp.GetHero("dekar"));
 
-               battle::Resources battleRes;
-
-               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;
-               battleRes.healthLabelRow = 1;
-               battleRes.manaLabelCol = 0;
-               battleRes.manaLabelRow = 2;
-               battleRes.moveLabelCol = 0;
-               battleRes.moveLabelRow = 3;
-               battleRes.ikariLabelCol = 0;
-               battleRes.ikariLabelRow = 4;
-
-               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 = intp.GetColor("heroesBgColor").MapRGB(screen.Screen()->format);
-
-               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");
+               battle::Resources *battleRes(intp.GetBattleResources("battleResources"));
 
                maxim.AddSpell(intp.GetSpell("resetSpell"));
                Spell *strongSpell(intp.GetSpell("strongSpell"));
@@ -161,16 +121,6 @@ int main(int argc, char **argv) {
                maxim.AddSpell(valorSpell);
                selan.AddSpell(valorSpell);
 
-               battleRes.spellMenuHeadline = intp.GetString("spellMenuHeadline");
-               battleRes.spellMenuPrototype = Menu<const Spell *>(*intp.GetMenuProperties("spellMenuPrototype"));
-
-               battleRes.weaponMenuIcon = intp.GetSprite("swordIcon");
-               battleRes.armorMenuIcon = intp.GetSprite("armorIcon");
-               battleRes.shieldMenuIcon = intp.GetSprite("shieldIcon");
-               battleRes.helmetMenuIcon = intp.GetSprite("helmetIcon");
-               battleRes.ringMenuIcon = intp.GetSprite("ringIcon");
-               battleRes.jewelMenuIcon = intp.GetSprite("jewelIcon");
-
                Inventory inventory;
                inventory.Add(intp.GetItem("antidoteItem"), 9);
                inventory.Add(intp.GetItem("magicJarItem"), 4);
@@ -178,10 +128,7 @@ int main(int argc, char **argv) {
                inventory.Add(intp.GetItem("powerPotionItem"), 4);
                inventory.Add(intp.GetItem("escapeItem"), 2);
                inventory.Add(intp.GetItem("sleepBallItem"), 1);
-               battleRes.inventory = &inventory;
-
-               battleRes.itemMenuHeadline = intp.GetString("itemMenuHeadline");
-               battleRes.itemMenuPrototype = Menu<const common::Item *>(*intp.GetMenuProperties("itemMenuPrototype"));
+               battleRes->inventory = &inventory;
 
                maxim.SetWeapon(intp.GetItem("zircoSwordItem"));
                maxim.SetArmor(intp.GetItem("zirconArmorItem"));
@@ -212,12 +159,7 @@ int main(int argc, char **argv) {
                dekar.SetRing(intp.GetItem("rocketRingItem"));
                dekar.SetJewel(intp.GetItem("krakenRockItem"));
 
-               battleRes.ikariMenuHeadline = intp.GetString("ikariMenuHeadline");
-               battleRes.noEquipmentText = intp.GetString("noEquipmentText");
-               battleRes.ikariMenuPrototype = Menu<const Item *>(*intp.GetMenuProperties("ikariMenuPrototype"));
-               battleRes.escapeText = intp.GetString("escapeText");
-
-               BattleState *battleState(new BattleState(bg, monstersLayout, heroesLayout, &battleRes));
+               BattleState *battleState(new BattleState(bg, monstersLayout, heroesLayout, battleRes));
                battleState->AddMonster(monster);
                battleState->AddMonster(monster);
                battleState->AddMonster(monster);