X-Git-Url: https://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmain.cpp;h=491a0ec6c77d8fda2791dd5ae3d287b8fc89ae54;hb=3ecf065f3bcef720e82bb137a2be734ed7e16746;hp=803977a690221fb6bf88c0e0b129a40d98c5d5d7;hpb=7f5b06f80ee58a220a235084aac384227ba87d85;p=l2e.git

diff --git a/src/main.cpp b/src/main.cpp
index 803977a..491a0ec 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -128,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");
@@ -162,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");
@@ -181,7 +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, ':');
+		battleRes.itemMenuProperties = 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<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.ikariMenuProperties = intp.GetMenuProperties("ikariMenuPrototype");
 		battleRes.escapeText = intp.GetString("escapeText");
 
 		BattleState *battleState(new BattleState(bg, monstersLayout, heroesLayout, &battleRes));