X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmain.cpp;h=f78e7f7d74373f5fb3a812c6a3fbfca5255cccf1;hb=5ff22859ee5966297862d3384206fa2cf52da7ca;hp=8fcb09e7335df8f796e4cb343de0c87a8b0be33e;hpb=aedf4ae020e3c811341df79ceae63ca56fb7ce83;p=l2e.git

diff --git a/src/main.cpp b/src/main.cpp
index 8fcb09e..f78e7f7 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -191,6 +191,7 @@ int main(int argc, char **argv) {
 		gameState.party[1] = &gameState.heroes[1];
 		gameState.party[2] = &gameState.heroes[2];
 		gameState.party[3] = &gameState.heroes[3];
+		gameState.partySize = 4;
 
 		GameConfig gameConfig;
 		gameConfig.state = &gameState;
@@ -221,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"));
@@ -293,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;
@@ -318,6 +329,118 @@ int main(int argc, char **argv) {
 		menuResources.mainMenuTimeText = "TIME";
 		menuResources.mainMenuGoldText = "GOLD";
 
+		graphics::Sprite heroCursor(IMG_Load("test-data/hero-cursor.png"), 64, 16);
+		menuResources.heroCursor = &heroCursor;
+		menuResources.heroCursorBlinkTime = 532;
+
+		menuResources.noEquipmentText = "No equip";
+
+		graphics::Sprite shoulderNav(IMG_Load("test-data/shoulder-nav.png"), 160, 16);
+		menuResources.shoulderNav = &shoulderNav;
+
+		menuResources.atpLabel = "ATP";
+		menuResources.dfpLabel = "DFP";
+		menuResources.strLabel = "STR";
+		menuResources.aglLabel = "AGL";
+		menuResources.intLabel = "INT";
+		menuResources.gutLabel = "GUT";
+		menuResources.mgrLabel = "MGR";
+
+		menuResources.ipLabel = "IP";
+		menuResources.experienceLabel = "NOW EXP";
+		menuResources.nextLevelLabel = "NEXT LEVEL";
+
+		graphics::MenuProperties statusMenuProperties;
+		statusMenuProperties.cols = 2;
+		statusMenuProperties.rows = 1;
+		statusMenuProperties.charsPerEntry = 6;
+		statusMenuProperties.rowGap = 0;
+		statusMenuProperties.colGap = 16;
+		statusMenuProperties.cursor = &menuCursor;
+		statusMenuProperties.font = &menuFont;
+		statusMenuProperties.wrapX = true;
+		menuResources.statusMenuProperties = &statusMenuProperties;
+
+		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;
+
+		graphics::MenuProperties equipmentActionMenuProperties;
+		equipmentActionMenuProperties.cols = 1;
+		equipmentActionMenuProperties.rows = 5;
+		equipmentActionMenuProperties.charsPerEntry = 10;
+		equipmentActionMenuProperties.rowGap = 8;
+		equipmentActionMenuProperties.cursor = &menuCursor;
+		equipmentActionMenuProperties.selectedCursor = &menuActiveCursor;
+		equipmentActionMenuProperties.font = &menuFont;
+		equipmentActionMenuProperties.iconSpace = 0;
+		menuResources.equipmentActionMenuProperties = &equipmentActionMenuProperties;
+
+		graphics::MenuProperties equipmentMenuProperties;
+		equipmentMenuProperties.cols = 1;
+		equipmentMenuProperties.rows = 6;
+		equipmentMenuProperties.charsPerEntry = 12;
+		equipmentMenuProperties.rowGap = 16;
+		equipmentMenuProperties.cursor = &menuCursor;
+		equipmentMenuProperties.selectedCursor = &menuActiveCursor;
+		equipmentMenuProperties.font = menuResources.statusFont;
+		// TODO: disabled font
+		equipmentMenuProperties.disabledFont = menuResources.statusFont;
+		equipmentMenuProperties.iconSpace = 16;
+		menuResources.equipmentMenuProperties = &equipmentMenuProperties;
+
+		menuResources.equipMenuEquipLabel = "EQUIP";
+		menuResources.equipMenuStrongestLabel = "STRONGEST";
+		menuResources.equipMenuRemoveLabel = "REMOVE";
+		menuResources.equipMenuRemoveAllLabel = "REMOVE ALL";
+		menuResources.equipMenuDropLabel = "DROP";
+
 		InitScreen screen(width, height);
 
 		app::State *state(0);