split headers off of ikaris, items, and spells

diff --git a/src/main.cpp b/src/main.cpp
index 9d8e8d62650f1641d057dc434eb25895b858bf2e..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();
 

diff --git a/test-data/ikaris.l2h b/test-data/ikaris.l2h
new file mode 100644 (file)
index 0000000..f55cc91
--- /dev/null
+++ b/test-data/ikaris.l2h
@@ -0,0 +1,20 @@
+Ikari boomerangIkari
+Ikari courageIkari
+Ikari crisisCureIkari
+Ikari destroyIkari
+Ikari diveIkari
+Ikari dragonRushIkari
+Ikari fakeIkari
+Ikari firestormIkari
+Ikari forcefieldIkari
+Ikari gloomyIkari
+Ikari ironBarrierIkari
+Ikari lightGuardIkari
+Ikari magicCureIkari
+Ikari slowIkari
+Ikari suddenCureIkari
+Ikari tenLeggerIkari
+Ikari thundershriekIkari
+Ikari torrentIkari
+Ikari trickIkari
+Ikari vulnerableIkari

diff --git a/test-data/items.l2h b/test-data/items.l2h
new file mode 100644 (file)
index 0000000..c2461ec
--- /dev/null
+++ b/test-data/items.l2h
@@ -0,0 +1,39 @@
+Item antidoteItem
+Sprite armorIcon
+Sprite axIcon
+Sprite ballIcon
+Sprite crankIcon
+Item eagleRockItem
+Item escapeItem
+Item evilJewelItem
+Item ghostRingItem
+Sprite helmetIcon
+Item hiPotionItem
+Item holyCapItem
+Item holyRobeItem
+Item holyShieldItem
+Sprite jewelIcon
+Item krakenRockItem
+Item legendHelmItem
+Item lizardBlowItem
+Item magicJarItem
+Item megaShieldItem
+Sprite potionIcon
+Item powerPotionItem
+Item powerRingItem
+Sprite ringIcon
+Item rocketRingItem
+Sprite rodIcon
+Item sProRingItem
+Sprite shieldIcon
+Item sleepBallItem
+Sprite spearIcon
+SimpleAnimation swordAttackAnimation
+Sprite swordIcon
+Item zircoAxItem
+Item zircoGlovesItem
+Item zircoHelmetItem
+Item zircoSwordItem
+Item zircoWhipItem
+Item zirconArmorItem
+Item zirconPlateItem

diff --git a/test-data/items.l2s b/test-data/items.l2s
index e3eadbfaacff1da4fc15ed3b64656ae605761736..76dd5aa57292b49b4db641c2e039f34dd396a869 100644 (file)
--- a/test-data/items.l2s
+++ b/test-data/items.l2s
@@ -1,3 +1,5 @@
+include "ikaris.l2h"
+
 export Sprite potionIcon {
        image: :"item-icons.png",
        size: <16,16>

diff --git a/test-data/spells.l2h b/test-data/spells.l2h
new file mode 100644 (file)
index 0000000..2da4057
--- /dev/null
+++ b/test-data/spells.l2h
@@ -0,0 +1,7 @@
+Spell championSpell
+Spell escapeSpell
+Spell rallySpell
+Spell resetSpell
+Spell strongSpell
+Spell strongerSpell
+Spell valorSpell

diff --git a/test-data/test.l2s b/test-data/test.l2s
index 098e0b20c1cbd89e1aecd0d3cf4f288d6ef7b87e..48817f47965aca37ae2c3df5c209edbc1f250b30 100644 (file)
--- a/test-data/test.l2s
+++ b/test-data/test.l2s
@@ -1,6 +1,6 @@
-include "ikaris.l2s"
-include "items.l2s"
-include "spells.l2s"
+include "ikaris.l2h"
+include "items.l2h"
+include "spells.l2h"
 
 Number frameTime 33
 Number twoFramesTime 66