X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmain.cpp;h=acdc0ad7e3dd457e2afb7d937079a26f491d9702;hb=670dd3c61cba875345b6755d41f479cff8d964c4;hp=5ea2a03f706e64006a1e5f3485a4349c1dc509f0;hpb=c1de2db3755c2cffd790c58bbd92e7fc993afcb5;p=l2e.git diff --git a/src/main.cpp b/src/main.cpp index 5ea2a03..acdc0ad 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -222,12 +222,19 @@ int main(int argc, char **argv) { gameState.heroes[0].AddSpell(valorSpell); gameState.heroes[1].AddSpell(valorSpell); + gameState.inventory.Add(caster.GetItem("zirconPlateItem")); gameState.inventory.Add(caster.GetItem("antidoteItem"), 9); + gameState.inventory.Add(caster.GetItem("powerRingItem")); gameState.inventory.Add(caster.GetItem("magicJarItem"), 4); + gameState.inventory.Add(caster.GetItem("sProRingItem")); gameState.inventory.Add(caster.GetItem("hiPotionItem"), 4); + gameState.inventory.Add(caster.GetItem("powerRingItem")); gameState.inventory.Add(caster.GetItem("powerPotionItem"), 4); + gameState.inventory.Add(caster.GetItem("zircoSwordItem")); gameState.inventory.Add(caster.GetItem("escapeItem"), 2); + gameState.inventory.Add(caster.GetItem("zircoHelmetItem")); gameState.inventory.Add(caster.GetItem("sleepBallItem"), 1); + gameState.inventory.Add(caster.GetItem("zirconPlateItem")); gameState.heroes[0].SetWeapon(caster.GetItem("zircoSwordItem")); gameState.heroes[0].SetArmor(caster.GetItem("zirconArmorItem")); @@ -294,6 +301,9 @@ int main(int argc, char **argv) { menuResources.normalFont = &menuFont; graphics::Sprite menuCursor(IMG_Load("test-data/menu-cursor.png"), 32, 16); + menuResources.menuCursor = &menuCursor; + graphics::Sprite menuActiveCursor(IMG_Load("test-data/menu-cursor-active.png"), 32, 18); + menuResources.menuActiveCursor = &menuActiveCursor; graphics::MenuProperties mainMenuProperties; mainMenuProperties.cols = 2; @@ -361,6 +371,7 @@ int main(int argc, char **argv) { itemMenuProperties.rowGap = 8; itemMenuProperties.colGap = 16; itemMenuProperties.cursor = &menuCursor; + itemMenuProperties.selectedCursor = &menuActiveCursor; itemMenuProperties.font = &menuFont; itemMenuProperties.wrapX = true; itemMenuProperties.wrapY = true; @@ -375,6 +386,7 @@ int main(int argc, char **argv) { inventoryMenuProperties.charsPerEntry = 13; inventoryMenuProperties.rowGap = 8; inventoryMenuProperties.cursor = &menuCursor; + inventoryMenuProperties.selectedCursor = &menuActiveCursor; inventoryMenuProperties.font = &menuFont; // TODO: disabled font inventoryMenuProperties.disabledFont = &menuFont; @@ -383,6 +395,22 @@ int main(int argc, char **argv) { inventoryMenuProperties.delimiter = ':'; menuResources.inventoryMenuProperties = &inventoryMenuProperties; + graphics::MenuProperties spellMenuProperties; + spellMenuProperties.cols = 2; + spellMenuProperties.rows = 6; + spellMenuProperties.charsPerEntry = 8; + spellMenuProperties.rowGap = 8; + spellMenuProperties.colGap = 48; + spellMenuProperties.cursor = &menuCursor; + spellMenuProperties.selectedCursor = &menuActiveCursor; + spellMenuProperties.font = &menuFont; + // TODO: disabled font + spellMenuProperties.disabledFont = &menuFont; + spellMenuProperties.iconSpace = 0; + spellMenuProperties.charsPerNumber = 2; + spellMenuProperties.delimiter = ':'; + menuResources.spellMenuProperties = &spellMenuProperties; + InitScreen screen(width, height); app::State *state(0);