X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmain.cpp;h=a1fbfaf940d9cb29d3e2b16a366bff96fa17e645;hb=1aa61eca26f5b4a4cb856a39e802f5899548b691;hp=daeb3c4e1441f219e4fa78a6907e95cf8a64681f;hpb=795bcbebfc3a63f374f8da0790af5b7105adb68a;p=l2e.git diff --git a/src/main.cpp b/src/main.cpp index daeb3c4..a1fbfaf 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -162,7 +162,7 @@ int main(int argc, char **argv) { 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.spellMenuPrototype = Menu(*intp.GetMenuProperties("spellMenuPrototype")); battleRes.weaponMenuIcon = intp.GetSprite("swordIcon"); battleRes.armorMenuIcon = intp.GetSprite("armorIcon"); @@ -181,7 +181,7 @@ int main(int argc, char **argv) { 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, ':'); + battleRes.itemMenuPrototype = Menu(*intp.GetMenuProperties("itemMenuPrototype")); maxim.SetWeapon(intp.GetItem("zircoSwordItem")); maxim.SetArmor(intp.GetItem("zirconArmorItem")); @@ -214,7 +214,7 @@ int main(int argc, char **argv) { battleRes.ikariMenuHeadline = intp.GetString("ikariMenuHeadline"); battleRes.noEquipmentText = intp.GetString("noEquipmentText"); - 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.ikariMenuPrototype = Menu(*intp.GetMenuProperties("ikariMenuPrototype")); battleRes.escapeText = intp.GetString("escapeText"); BattleState *battleState(new BattleState(bg, monstersLayout, heroesLayout, &battleRes));