refactored battle resources to better compatibility with loader

[l2e.git] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index 662e5b901974b2995720f27cfca4b4e2acb7d61f..491a0ec6c77d8fda2791dd5ae3d287b8fc89ae54 100644 (file)
--- 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 {
@@ -130,7 +128,7 @@ int main(int argc, char **argv) {
                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.heroesBgColor = intp.GetColor("heroesBgColor");
 
                battleRes.healthGauge = intp.GetGauge("healthGauge");
                battleRes.manaGauge = intp.GetGauge("manaGauge");
@@ -164,7 +162,7 @@ int main(int argc, char **argv) {
                selan.AddSpell(valorSpell);
 
                battleRes.spellMenuHeadline = intp.GetString("spellMenuHeadline");
-               battleRes.spellMenuPrototype = Menu<const Spell *>(intp.GetFont("normalFont"), intp.GetFont("disabledFont"), intp.GetSprite("handCursor"), 9, 6, 8, 0, 2, 32, 2, ':');
+               battleRes.spellMenuProperties = intp.GetMenuProperties("spellMenuPrototype");
 
                battleRes.weaponMenuIcon = intp.GetSprite("swordIcon");
                battleRes.armorMenuIcon = intp.GetSprite("armorIcon");
@@ -183,11 +181,7 @@ int main(int argc, char **argv) {
                battleRes.inventory = &inventory;
 
                battleRes.itemMenuHeadline = intp.GetString("itemMenuHeadline");
-               battleRes.itemMenuPrototype = Menu<const common::Item *>(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.itemMenuProperties = intp.GetMenuProperties("itemMenuPrototype");
 
                maxim.SetWeapon(intp.GetItem("zircoSwordItem"));
                maxim.SetArmor(intp.GetItem("zirconArmorItem"));
@@ -218,11 +212,10 @@ int main(int argc, char **argv) {
                dekar.SetRing(intp.GetItem("rocketRingItem"));
                dekar.SetJewel(intp.GetItem("krakenRockItem"));
 
-               battleRes.ikariMenuHeadline = "Please choose equipment.";
-               battleRes.noEquipmentText = "No equip";
-               battleRes.ikariMenuPrototype = Menu<const Item *>(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.";
+               battleRes.ikariMenuHeadline = intp.GetString("ikariMenuHeadline");
+               battleRes.noEquipmentText = intp.GetString("noEquipmentText");
+               battleRes.ikariMenuProperties = intp.GetMenuProperties("ikariMenuPrototype");
+               battleRes.escapeText = intp.GetString("escapeText");
 
                BattleState *battleState(new BattleState(bg, monstersLayout, heroesLayout, &battleRes));
                battleState->AddMonster(monster);