From 9a68d1231474bbc163b97398d3e4c87cbc4fd4ba Mon Sep 17 00:00:00 2001 From: Daniel Karbach Date: Fri, 31 Aug 2012 23:46:59 +0200 Subject: [PATCH] moved icon config to test.l2s --- src/main.cpp | 82 +++++++++++++++++++--------------------------- test-data/test.l2s | 62 +++++++++++++++++++++++++++++++++++ 2 files changed, 96 insertions(+), 48 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index 2f1c12a..ecd24a1 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -163,71 +163,57 @@ int main(int argc, char **argv) { maxim.AddSpell(valorSpell); selan.AddSpell(valorSpell); - battleRes.spellMenuHeadline = "Please choose a spell."; + battleRes.spellMenuHeadline = intp.GetString("spellMenuHeadline"); battleRes.spellMenuPrototype = Menu(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); - 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.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.SetMenuIcon(intp.GetSprite("potionIcon")); antidote.SetUsableInBattle(); antidote.GetTargetingMode().TargetSingleAlly(); inventory.Add(&antidote, 9); Item magicJar; magicJar.SetName("Magic jar"); - magicJar.SetMenuIcon(&potionIcon); + magicJar.SetMenuIcon(intp.GetSprite("potionIcon")); magicJar.SetUsableInBattle(); magicJar.GetTargetingMode().TargetSingleAlly(); inventory.Add(&magicJar, 4); Item hiPotion; hiPotion.SetName("Hi-Potion"); - hiPotion.SetMenuIcon(&potionIcon); + hiPotion.SetMenuIcon(intp.GetSprite("potionIcon")); hiPotion.SetUsableInBattle(); hiPotion.GetTargetingMode().TargetSingleAlly(); inventory.Add(&hiPotion, 4); Item powerPotion; powerPotion.SetName("Power potion"); - powerPotion.SetMenuIcon(&potionIcon); + powerPotion.SetMenuIcon(intp.GetSprite("potionIcon")); inventory.Add(&powerPotion, 4); Item escape; escape.SetName("Escape"); inventory.Add(&escape, 2); Item sleepBall; sleepBall.SetName("Sleep ball"); - sleepBall.SetMenuIcon(&ballIcon); + sleepBall.SetMenuIcon(intp.GetSprite("ballIcon")); sleepBall.SetUsableInBattle(); sleepBall.GetTargetingMode().TargetSingleEnemy(); inventory.Add(&sleepBall, 1); Item multiBall; multiBall.SetName("Multi-ball!"); - multiBall.SetMenuIcon(&ballIcon); + multiBall.SetMenuIcon(intp.GetSprite("ballIcon")); multiBall.SetUsableInBattle(); multiBall.GetTargetingMode().TargetMultipleEnemies(); inventory.Add(&multiBall, 1); Item figgoru; figgoru.SetName("Figgoru"); - figgoru.SetMenuIcon(&crankIcon); + figgoru.SetMenuIcon(intp.GetSprite("crankIcon")); figgoru.GetTargetingMode().TargetAllEnemies(); inventory.Add(&figgoru, 1); battleRes.inventory = &inventory; @@ -241,7 +227,7 @@ int main(int argc, char **argv) { Item zircoSword; zircoSword.SetName("Zirco sword"); - zircoSword.SetMenuIcon(&swordIcon); + zircoSword.SetMenuIcon(intp.GetSprite("swordIcon")); zircoSword.GetTargetingMode().TargetSingleEnemy(); Ikari firestorm; firestorm.SetName("Firestorm"); @@ -253,7 +239,7 @@ int main(int argc, char **argv) { maxim.SetWeapon(&zircoSword); Item zirconArmor; zirconArmor.SetName("Zircon armor"); - zirconArmor.SetMenuIcon(&armorIcon); + zirconArmor.SetMenuIcon(intp.GetSprite("armorIcon")); Ikari magicCure; magicCure.SetName("Magic cure"); magicCure.SetCost(128); @@ -263,7 +249,7 @@ int main(int argc, char **argv) { maxim.SetArmor(&zirconArmor); Item holyShield; holyShield.SetName("Holy shield"); - holyShield.SetMenuIcon(&shieldIcon); + holyShield.SetMenuIcon(intp.GetSprite("shieldIcon")); Ikari lightGuard; lightGuard.SetName("Light guard"); lightGuard.SetCost(128); @@ -273,7 +259,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); @@ -283,7 +269,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); @@ -293,7 +279,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); @@ -304,7 +290,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"); @@ -315,7 +301,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); @@ -325,7 +311,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); @@ -335,7 +321,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); @@ -345,7 +331,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); @@ -355,7 +341,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); @@ -366,7 +352,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"); @@ -378,7 +364,7 @@ int main(int argc, char **argv) { guy.SetArmor(&zirconArmor); Item megaShield; megaShield.SetName("Mega shield"); - megaShield.SetMenuIcon(&shieldIcon); + megaShield.SetMenuIcon(intp.GetSprite("shieldIcon")); Ikari ironBarrier; ironBarrier.SetName("Iron barrier"); ironBarrier.SetCost(255); @@ -388,7 +374,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); @@ -398,7 +384,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); @@ -411,7 +397,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"); @@ -422,7 +408,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); @@ -434,7 +420,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); @@ -444,7 +430,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); diff --git a/test-data/test.l2s b/test-data/test.l2s index f947f91..28a08ee 100644 --- a/test-data/test.l2s +++ b/test-data/test.l2s @@ -511,3 +511,65 @@ export Sprite itemTargetCursor { } include "test-data/spells.l2s" + +export String spellMenuHeadline "Please choose a spell." + +export Sprite potionIcon { + image: "test-data/item-icons.png", + size: <16,16> +} +export Sprite ballIcon { + image: "test-data/item-icons.png", + size: <16,16>, + offset: <0,16> +} +export Sprite crankIcon { + image: "test-data/item-icons.png", + size: <16,16>, + offset: <0,32> +} +export Sprite spearIcon { + image: "test-data/item-icons.png", + size: <16,16>, + offset: <0,48> +} +export Sprite swordIcon { + image: "test-data/item-icons.png", + size: <16,16>, + offset: <0,64> +} +export Sprite axIcon { + image: "test-data/item-icons.png", + size: <16,16>, + offset: <0,80> +} +export Sprite rodIcon { + image: "test-data/item-icons.png", + size: <16,16>, + offset: <0,96> +} +export Sprite armorIcon { + image: "test-data/item-icons.png", + size: <16,16>, + offset: <0,112> +} +export Sprite shieldIcon { + image: "test-data/item-icons.png", + size: <16,16>, + offset: <0,128> +} +export Sprite helmetIcon { + image: "test-data/item-icons.png", + size: <16,16>, + offset: <0,144> +} +export Sprite ringIcon { + image: "test-data/item-icons.png", + size: <16,16>, + offset: <0,160> +} +export Sprite jewelIcon { + image: "test-data/item-icons.png", + size: <16,16>, + offset: <0,176> +} -- 2.39.2