added second column in ikari menu

[l2e.git] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index 4f50463ba258fa6102f0ab6958e011812fddb3ca..3e223491aeb4a280f1f4874851a64573fd445188 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -95,7 +95,7 @@ int main(int argc, char **argv) {
                maxim.SetHealth(33);
                maxim.SetMaxMana(20);
                maxim.SetMana(20);
-               maxim.SetIP(100);
+               maxim.SetIP(55);
 
                SDL_Surface *selanImg(IMG_Load("test-data/selan.png"));
                Sprite selanSprite(selanImg, 64, 64);
@@ -269,6 +269,13 @@ int main(int argc, char **argv) {
                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;
+
                Inventory inventory;
                Item antidote;
                antidote.SetName("Antidote");
@@ -437,13 +444,8 @@ int main(int argc, char **argv) {
                dekar.SetJewel(&krakenRock);
 
                battleRes.ikariMenuHeadline = "Please choose equipment.";
-               battleRes.ikariMenuPrototype = Menu<const Item *>(&normalFont, &disabledFont, &handCursorSprite, 26, 6, 8, 16, 1, 32);
-               battleRes.ikariMenuPrototype.Add("Zirco whip   Thundershriek", 0, false, &swordIcon);
-               battleRes.ikariMenuPrototype.Add("Zircon plate Sudden cure", 0, true, &armorIcon);
-               battleRes.ikariMenuPrototype.Add("Zirco gloves Forcefield", 0, true, &shieldIcon);
-               battleRes.ikariMenuPrototype.Add("Holy cap     Vulnerable", 0, false, &helmetIcon);
-               battleRes.ikariMenuPrototype.Add("Ghost ring   Destroy", 0, true, &ringIcon);
-               battleRes.ikariMenuPrototype.Add("Eagle rock   Dive", 0, true, &jewelIcon);
+               battleRes.noEquipmentText = "No equip";
+               battleRes.ikariMenuPrototype = Menu<const Item *>(&normalFont, &disabledFont, &handCursorSprite, 12, 6, normalFont.CharHeight() / 2, normalFont.CharWidth(), 1, normalFont.CharWidth() * 2, 0, ':', 12, normalFont.CharWidth());
 
                BattleState *battleState(new BattleState(bg, monstersLayout, heroesLayout, &battleRes));
                battleState->AddMonster(monster);