X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmain.cpp;h=acdc0ad7e3dd457e2afb7d937079a26f491d9702;hb=6a954cc1f6324d61282e21ec0d7dee6e6265f44f;hp=4c350de35f3e48432c40ef98cdb54c4826612745;hpb=559457f14d914f6b1cb5d588a0ccf97529f011d1;p=l2e.git

diff --git a/src/main.cpp b/src/main.cpp
index 4c350de..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;
@@ -354,6 +364,53 @@ int main(int argc, char **argv) {
 		menuResources.nextLabel = "NEXT";
 		menuResources.returnLabel = "RETURN";
 
+		graphics::MenuProperties itemMenuProperties;
+		itemMenuProperties.cols = 3;
+		itemMenuProperties.rows = 1;
+		itemMenuProperties.charsPerEntry = 5;
+		itemMenuProperties.rowGap = 8;
+		itemMenuProperties.colGap = 16;
+		itemMenuProperties.cursor = &menuCursor;
+		itemMenuProperties.selectedCursor = &menuActiveCursor;
+		itemMenuProperties.font = &menuFont;
+		itemMenuProperties.wrapX = true;
+		itemMenuProperties.wrapY = true;
+		menuResources.itemMenuProperties = &itemMenuProperties;
+		menuResources.itemMenuUseText = "USE";
+		menuResources.itemMenuSortText = "SORT";
+		menuResources.itemMenuDropText = "DROP";
+
+		graphics::MenuProperties inventoryMenuProperties;
+		inventoryMenuProperties.cols = 1;
+		inventoryMenuProperties.rows = 6;
+		inventoryMenuProperties.charsPerEntry = 13;
+		inventoryMenuProperties.rowGap = 8;
+		inventoryMenuProperties.cursor = &menuCursor;
+		inventoryMenuProperties.selectedCursor = &menuActiveCursor;
+		inventoryMenuProperties.font = &menuFont;
+		// TODO: disabled font
+		inventoryMenuProperties.disabledFont = &menuFont;
+		inventoryMenuProperties.iconSpace = 16;
+		inventoryMenuProperties.charsPerNumber = 2;
+		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);