X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmain.cpp;h=4280985185a5e8e144aa6f46d855c463dcf635d1;hb=a55d4589da1a0cdec73c0bcf69a2af6bccf868cb;hp=00b04d7dfe60750d247036709a7226d4ef0f0ef4;hpb=03dabc4ea94ac00e73c4a61260eaeb7f4a0973fe;p=l2e.git diff --git a/src/main.cpp b/src/main.cpp index 00b04d7..4280985 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -74,8 +74,6 @@ int main(int argc, char **argv) { const int width = 800; const int height = 480; - const int framerate = 33; - // std::srand(std::time(0)); try { @@ -83,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(); @@ -101,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 = SDL_MapRGB(screen.Screen()->format, 0x18, 0x28, 0x31); - - 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")); @@ -163,16 +121,6 @@ int main(int argc, char **argv) { maxim.AddSpell(valorSpell); selan.AddSpell(valorSpell); - battleRes.spellMenuHeadline = intp.GetString("spellMenuHeadline"); - battleRes.spellMenuPrototype = Menu(intp.GetFont("normalFont"), intp.GetFont("disabledFont"), intp.GetSprite("handCursor"), 9, 6, 8, 0, 2, 32, 2, ':'); - - 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); @@ -180,14 +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(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); - SimpleAnimation swordAttackAnimation(&swordAttackSprite, 2 * framerate, 4); + battleRes->inventory = &inventory; maxim.SetWeapon(intp.GetItem("zircoSwordItem")); maxim.SetArmor(intp.GetItem("zirconArmorItem")); @@ -211,57 +152,14 @@ int main(int argc, char **argv) { guy.SetJewel(intp.GetItem("evilJewelItem")); // NOTE: this is actually Artea equipment - Item lizardBlow; - lizardBlow.SetName("Lizard blow"); - lizardBlow.SetMenuIcon(intp.GetSprite("swordIcon")); - lizardBlow.GetTargetingMode().TargetSingleEnemy(); - Ikari dragonRush; - dragonRush.SetName("Dragon rush"); - dragonRush.SetCost(164); - dragonRush.GetTargetingMode().TargetSingleEnemy(); - dragonRush.SetPhysical(); - lizardBlow.SetIkari(&dragonRush); -// dekar.SetWeapon(&lizardBlow); - Item holyRobe; - holyRobe.SetName("Holy robe"); - holyRobe.SetMenuIcon(intp.GetSprite("armorIcon")); - Ikari crisisCure; - crisisCure.SetName("Crisis cure"); - crisisCure.SetCost(164); - crisisCure.GetTargetingMode().TargetAllAllies(); - crisisCure.SetMagical(); - holyRobe.SetIkari(&crisisCure); - dekar.SetArmor(&holyRobe); +// dekar.SetWeapon(intp.GetItem("lizardBlowItem")); + dekar.SetArmor(intp.GetItem("holyRobeItem")); dekar.SetShield(intp.GetItem("zircoGlovesItem")); dekar.SetHelmet(intp.GetItem("holyCapItem")); - Item rocketRing; - rocketRing.SetName("Rocket ring"); - rocketRing.SetMenuIcon(intp.GetSprite("ringIcon")); - Ikari fake; - fake.SetName("Fake"); - fake.SetCost(32); - fake.GetTargetingMode().TargetSingleAlly(); - fake.SetMagical(); - rocketRing.SetIkari(&fake); - dekar.SetRing(&rocketRing); - Item krakenRock; - krakenRock.SetName("Kraken rock"); - krakenRock.SetMenuIcon(intp.GetSprite("jewelIcon")); - Ikari tenLegger; - tenLegger.SetName("Ten-legger"); - tenLegger.SetCost(164); - tenLegger.GetTargetingMode().TargetAllEnemies(); - tenLegger.SetPhysical(); - rocketRing.SetIkari(&tenLegger); - dekar.SetJewel(&krakenRock); - - battleRes.ikariMenuHeadline = "Please choose equipment."; - battleRes.noEquipmentText = "No equip"; - battleRes.ikariMenuPrototype = Menu(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."; + dekar.SetRing(intp.GetItem("rocketRingItem")); + dekar.SetJewel(intp.GetItem("krakenRockItem")); - 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);