X-Git-Url: https://git.localhorst.tv/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmain.cpp;h=3e223491aeb4a280f1f4874851a64573fd445188;hb=4170813213bafe6f4a01a79bf42308ddb7f3c545;hp=7b47f858494ee04365987522d7d4409b1f56dc87;hpb=cec6ebf5e666a15ffe27b0f09f9b268e2cfcdf9b;p=l2e.git diff --git a/src/main.cpp b/src/main.cpp index 7b47f85..3e22349 100644 --- 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); @@ -444,13 +444,8 @@ int main(int argc, char **argv) { dekar.SetJewel(&krakenRock); battleRes.ikariMenuHeadline = "Please choose equipment."; - battleRes.ikariMenuPrototype = Menu(&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(&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);