X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmain.cpp;h=00c07c592d6d311b5baae18719bffab1d4d50ff5;hb=771a3daeecf527a9b5873e412e263ad251c59ab5;hp=1c87e33ff95a3728cc006b0470591da0e1a45c72;hpb=31883e0019783f10553ddcc122a49728934bd832;p=l2e.git diff --git a/src/main.cpp b/src/main.cpp index 1c87e33..00c07c5 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -107,16 +107,8 @@ int main(int argc, char **argv) { battleRes.attackIcons = intp.GetSprite("attackIcons"); battleRes.attackChoiceIcons = intp.GetSprite("attackChoiceIcons"); battleRes.moveIcons = intp.GetSprite("moveIcons"); - - 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; - + 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"); @@ -133,200 +125,75 @@ 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")); - 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.spellMenuHeadline = "Please choose a spell."; - battleRes.spellMenuPrototype = Menu(&normalFont, &disabledFont, &handCursorSprite, 9, 6, 8, 0, 2, 32, 2, ':'); - - SDL_Surface *itemIcons(IMG_Load("test-data/item-icons.png")); - Sprite potionIcon(itemIcons, 16, 16); - Sprite ballIcon(itemIcons, 16, 16, 0, 16); - Sprite crankIcon(itemIcons, 16, 16, 0, 32); - Sprite spearIcon(itemIcons, 16, 16, 0, 48); - Sprite swordIcon(itemIcons, 16, 16, 0, 64); - Sprite axIcon(itemIcons, 16, 16, 0, 80); - Sprite rodIcon(itemIcons, 16, 16, 0, 96); - Sprite armorIcon(itemIcons, 16, 16, 0, 112); - Sprite shieldIcon(itemIcons, 16, 16, 0, 128); - Sprite helmetIcon(itemIcons, 16, 16, 0, 144); - Sprite ringIcon(itemIcons, 16, 16, 0, 160); - Sprite jewelIcon(itemIcons, 16, 16, 0, 176); - - battleRes.weaponMenuIcon = &swordIcon; - battleRes.armorMenuIcon = &armorIcon; - battleRes.shieldMenuIcon = &shieldIcon; - battleRes.helmetMenuIcon = &helmetIcon; - battleRes.ringMenuIcon = &ringIcon; - battleRes.jewelMenuIcon = &jewelIcon; + 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 = 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; - Item antidote; - antidote.SetName("Antidote"); - antidote.SetMenuIcon(&potionIcon); - antidote.SetUsableInBattle(); - antidote.GetTargetingMode().TargetSingleAlly(); - inventory.Add(&antidote, 9); - Item magicJar; - magicJar.SetName("Magic jar"); - magicJar.SetMenuIcon(&potionIcon); - magicJar.SetUsableInBattle(); - magicJar.GetTargetingMode().TargetSingleAlly(); - inventory.Add(&magicJar, 4); - Item hiPotion; - hiPotion.SetName("Hi-Potion"); - hiPotion.SetMenuIcon(&potionIcon); - hiPotion.SetUsableInBattle(); - hiPotion.GetTargetingMode().TargetSingleAlly(); - inventory.Add(&hiPotion, 4); - Item powerPotion; - powerPotion.SetName("Power potion"); - powerPotion.SetMenuIcon(&potionIcon); - inventory.Add(&powerPotion, 4); - Item escape; - escape.SetName("Escape"); - inventory.Add(&escape, 2); - Item sleepBall; - sleepBall.SetName("Sleep ball"); - sleepBall.SetMenuIcon(&ballIcon); - sleepBall.SetUsableInBattle(); - sleepBall.GetTargetingMode().TargetSingleEnemy(); - inventory.Add(&sleepBall, 1); - Item multiBall; - multiBall.SetName("Multi-ball!"); - multiBall.SetMenuIcon(&ballIcon); - multiBall.SetUsableInBattle(); - multiBall.GetTargetingMode().TargetMultipleEnemies(); - inventory.Add(&multiBall, 1); - Item figgoru; - figgoru.SetName("Figgoru"); - figgoru.SetMenuIcon(&crankIcon); - figgoru.GetTargetingMode().TargetAllEnemies(); - inventory.Add(&figgoru, 1); + inventory.Add(intp.GetItem("antidoteItem"), 9); + inventory.Add(intp.GetItem("magicJarItem"), 4); + inventory.Add(intp.GetItem("hiPotionItem"), 4); + inventory.Add(intp.GetItem("powerPotionItem"), 4); + inventory.Add(intp.GetItem("escapeItem"), 2); + inventory.Add(intp.GetItem("sleepBallItem"), 1); battleRes.inventory = &inventory; - battleRes.itemMenuHeadline = "Please choose an item."; - battleRes.itemMenuPrototype = Menu(&normalFont, &disabledFont, &handCursorSprite, 15, 6, 8, 16, 1, 32, 2, ':'); + 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); - Item zircoSword; - zircoSword.SetName("Zirco sword"); - zircoSword.SetMenuIcon(&swordIcon); - zircoSword.GetTargetingMode().TargetSingleEnemy(); - Ikari firestorm; - firestorm.SetName("Firestorm"); - firestorm.SetCost(224); - firestorm.GetTargetingMode().TargetAllEnemies(); - firestorm.SetPhysical(); - zircoSword.SetIkari(&firestorm); - zircoSword.SetAttackAnimation(&swordAttackAnimation); - maxim.SetWeapon(&zircoSword); - Item zirconArmor; - zirconArmor.SetName("Zircon armor"); - zirconArmor.SetMenuIcon(&armorIcon); - Ikari magicCure; - magicCure.SetName("Magic cure"); - magicCure.SetCost(128); - magicCure.GetTargetingMode().TargetSingleAlly(); - magicCure.SetMagical(); - zirconArmor.SetIkari(&magicCure); - maxim.SetArmor(&zirconArmor); + maxim.SetWeapon(intp.GetItem("zircoSwordItem")); + maxim.SetArmor(intp.GetItem("zirconArmorItem")); Item holyShield; holyShield.SetName("Holy shield"); - holyShield.SetMenuIcon(&shieldIcon); + holyShield.SetMenuIcon(intp.GetSprite("shieldIcon")); Ikari lightGuard; lightGuard.SetName("Light guard"); lightGuard.SetCost(128); @@ -336,7 +203,7 @@ int main(int argc, char **argv) { maxim.SetShield(&holyShield); Item legendHelm; legendHelm.SetName("Legend helm"); - legendHelm.SetMenuIcon(&helmetIcon); + legendHelm.SetMenuIcon(intp.GetSprite("helmetIcon")); Ikari boomerang; boomerang.SetName("Boomerang"); boomerang.SetCost(164); @@ -346,7 +213,7 @@ int main(int argc, char **argv) { maxim.SetHelmet(&legendHelm); Item sProRing; sProRing.SetName("S-pro ring"); - sProRing.SetMenuIcon(&ringIcon); + sProRing.SetMenuIcon(intp.GetSprite("ringIcon")); Ikari courage; courage.SetName("Courage"); courage.SetCost(64); @@ -356,7 +223,7 @@ int main(int argc, char **argv) { maxim.SetRing(&sProRing); Item evilJewel; evilJewel.SetName("Evil jewel"); - evilJewel.SetMenuIcon(&jewelIcon); + evilJewel.SetMenuIcon(intp.GetSprite("jewelIcon")); Ikari gloomy; gloomy.SetName("Gloomy"); gloomy.SetCost(164); @@ -367,7 +234,7 @@ int main(int argc, char **argv) { Item zircoWhip; zircoWhip.SetName("Zirco whip"); - zircoWhip.SetMenuIcon(&rodIcon); + zircoWhip.SetMenuIcon(intp.GetSprite("rodIcon")); zircoWhip.GetTargetingMode().TargetSingleEnemy(); Ikari thundershriek; thundershriek.SetName("Thundershriek"); @@ -378,7 +245,7 @@ int main(int argc, char **argv) { // selan.SetWeapon(&zircoWhip); Item zirconPlate; zirconPlate.SetName("Zircon plate"); - zirconPlate.SetMenuIcon(&armorIcon); + zirconPlate.SetMenuIcon(intp.GetSprite("armorIcon")); Ikari suddenCure; suddenCure.SetName("Sudden cure"); suddenCure.SetCost(96); @@ -388,7 +255,7 @@ int main(int argc, char **argv) { selan.SetArmor(&zirconPlate); Item zircoGloves; zircoGloves.SetName("Zirco gloves"); - zircoGloves.SetMenuIcon(&shieldIcon); + zircoGloves.SetMenuIcon(intp.GetSprite("shieldIcon")); Ikari forcefield; forcefield.SetName("Forcefield"); forcefield.SetCost(64); @@ -398,7 +265,7 @@ int main(int argc, char **argv) { selan.SetShield(&zircoGloves); Item holyCap; holyCap.SetName("Holy cap"); - holyCap.SetMenuIcon(&helmetIcon); + holyCap.SetMenuIcon(intp.GetSprite("helmetIcon")); Ikari vulnerable; vulnerable.SetName("Vulnerable"); vulnerable.SetCost(196); @@ -408,7 +275,7 @@ int main(int argc, char **argv) { selan.SetHelmet(&holyCap); Item ghostRing; ghostRing.SetName("Ghost ring"); - ghostRing.SetMenuIcon(&ringIcon); + ghostRing.SetMenuIcon(intp.GetSprite("ringIcon")); Ikari destroy; destroy.SetName("Destroy"); destroy.SetCost(128); @@ -418,7 +285,7 @@ int main(int argc, char **argv) { selan.SetRing(&ghostRing); Item eagleRock; eagleRock.SetName("Eagle rock"); - eagleRock.SetMenuIcon(&jewelIcon); + eagleRock.SetMenuIcon(intp.GetSprite("jewelIcon")); Ikari dive; dive.SetName("Dive"); dive.SetCost(128); @@ -429,7 +296,7 @@ int main(int argc, char **argv) { Item zircoAx; zircoAx.SetName("Zirco ax"); - zircoAx.SetMenuIcon(&axIcon); + zircoAx.SetMenuIcon(intp.GetSprite("axIcon")); zircoAx.GetTargetingMode().TargetSingleEnemy(); Ikari torrent; torrent.SetName("Torrent"); @@ -438,10 +305,10 @@ int main(int argc, char **argv) { torrent.SetPhysical(); zircoAx.SetIkari(&torrent); // guy.SetWeapon(&zircoAx); - guy.SetArmor(&zirconArmor); + guy.SetArmor(intp.GetItem("zirconArmorItem")); Item megaShield; megaShield.SetName("Mega shield"); - megaShield.SetMenuIcon(&shieldIcon); + megaShield.SetMenuIcon(intp.GetSprite("shieldIcon")); Ikari ironBarrier; ironBarrier.SetName("Iron barrier"); ironBarrier.SetCost(255); @@ -451,7 +318,7 @@ int main(int argc, char **argv) { guy.SetShield(&megaShield); Item zircoHelmet; zircoHelmet.SetName("Zirco helmet"); - zircoHelmet.SetMenuIcon(&helmetIcon); + zircoHelmet.SetMenuIcon(intp.GetSprite("helmetIcon")); Ikari slow; slow.SetName("Slow"); slow.SetCost(196); @@ -461,7 +328,7 @@ int main(int argc, char **argv) { guy.SetHelmet(&zircoHelmet); Item powerRing; powerRing.SetName("Power ring"); - powerRing.SetMenuIcon(&ringIcon); + powerRing.SetMenuIcon(intp.GetSprite("ringIcon")); Ikari trick; trick.SetName("Trick"); trick.SetCost(32); @@ -474,7 +341,7 @@ int main(int argc, char **argv) { // NOTE: this is actually Artea equipment Item lizardBlow; lizardBlow.SetName("Lizard blow"); - lizardBlow.SetMenuIcon(&swordIcon); + lizardBlow.SetMenuIcon(intp.GetSprite("swordIcon")); lizardBlow.GetTargetingMode().TargetSingleEnemy(); Ikari dragonRush; dragonRush.SetName("Dragon rush"); @@ -485,7 +352,7 @@ int main(int argc, char **argv) { // dekar.SetWeapon(&lizardBlow); Item holyRobe; holyRobe.SetName("Holy robe"); - holyRobe.SetMenuIcon(&armorIcon); + holyRobe.SetMenuIcon(intp.GetSprite("armorIcon")); Ikari crisisCure; crisisCure.SetName("Crisis cure"); crisisCure.SetCost(164); @@ -497,7 +364,7 @@ int main(int argc, char **argv) { dekar.SetHelmet(&holyCap); Item rocketRing; rocketRing.SetName("Rocket ring"); - rocketRing.SetMenuIcon(&ringIcon); + rocketRing.SetMenuIcon(intp.GetSprite("ringIcon")); Ikari fake; fake.SetName("Fake"); fake.SetCost(32); @@ -507,7 +374,7 @@ int main(int argc, char **argv) { dekar.SetRing(&rocketRing); Item krakenRock; krakenRock.SetName("Kraken rock"); - krakenRock.SetMenuIcon(&jewelIcon); + krakenRock.SetMenuIcon(intp.GetSprite("jewelIcon")); Ikari tenLegger; tenLegger.SetName("Ten-legger"); tenLegger.SetCost(164); @@ -518,7 +385,7 @@ int main(int argc, char **argv) { battleRes.ikariMenuHeadline = "Please choose equipment."; battleRes.noEquipmentText = "No equip"; - battleRes.ikariMenuPrototype = Menu(&normalFont, &disabledFont, &handCursorSprite, 12, 6, normalFont.CharHeight() / 2, normalFont.CharWidth(), 1, normalFont.CharWidth() * 2, 0, ':', 12, normalFont.CharWidth()); + 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.";