X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmain.cpp;h=f3103995f27b92677c714d0991f7f03d44ed1d51;hb=37f46a0eb5ddbf9e3de672cf6da97605e41bd1f4;hp=08547d6088a3ab529dcac49b3334d2fd1f7f0eba;hpb=1338442a6db3a706d09622188aad1cdfe183a70b;p=l2e.git

diff --git a/src/main.cpp b/src/main.cpp
index 08547d6..f310399 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -298,8 +298,11 @@ int main(int argc, char **argv) {
 
 		graphics::Sprite menuFontSprite(IMG_Load("test-data/menu-font.png"), 16, 16);
 		graphics::Font menuFont(&menuFontSprite, 0, -2);
+		graphics::Sprite menuInactiveFontSprite(IMG_Load("test-data/menu-font-inactive.png"), 16, 16);
+		graphics::Font menuInactiveFont(&menuInactiveFontSprite, 0, -2);
 
 		menuResources.normalFont = &menuFont;
+		menuResources.inactiveFont = &menuInactiveFont;
 
 		graphics::Sprite menuCursor(IMG_Load("test-data/menu-cursor.png"), 32, 16);
 		menuResources.menuCursor = &menuCursor;
@@ -389,8 +392,7 @@ int main(int argc, char **argv) {
 		inventoryMenuProperties.cursor = &menuCursor;
 		inventoryMenuProperties.selectedCursor = &menuActiveCursor;
 		inventoryMenuProperties.font = &menuFont;
-		// TODO: disabled font
-		inventoryMenuProperties.disabledFont = &menuFont;
+		inventoryMenuProperties.disabledFont = &menuInactiveFont;
 		inventoryMenuProperties.iconSpace = 16;
 		inventoryMenuProperties.charsPerNumber = 2;
 		inventoryMenuProperties.delimiter = ':';
@@ -405,8 +407,7 @@ int main(int argc, char **argv) {
 		spellMenuProperties.cursor = &menuCursor;
 		spellMenuProperties.selectedCursor = &menuActiveCursor;
 		spellMenuProperties.font = &menuFont;
-		// TODO: disabled font
-		spellMenuProperties.disabledFont = &menuFont;
+		spellMenuProperties.disabledFont = &menuInactiveFont;
 		spellMenuProperties.iconSpace = 0;
 		spellMenuProperties.charsPerNumber = 2;
 		spellMenuProperties.delimiter = ':';
@@ -431,9 +432,8 @@ int main(int argc, char **argv) {
 		equipmentMenuProperties.cursor = &menuCursor;
 		equipmentMenuProperties.selectedCursor = &menuActiveCursor;
 		equipmentMenuProperties.font = menuResources.statusFont;
-		// TODO: disabled font
-		equipmentMenuProperties.disabledFont = menuResources.statusFont;
 		equipmentMenuProperties.iconSpace = 16;
+		equipmentMenuProperties.wrapY = true;
 		menuResources.equipmentMenuProperties = &equipmentMenuProperties;
 
 		menuResources.equipMenuEquipLabel = "EQUIP";
@@ -442,6 +442,38 @@ int main(int argc, char **argv) {
 		menuResources.equipMenuRemoveAllLabel = "REMOVE ALL";
 		menuResources.equipMenuDropLabel = "DROP";
 
+		graphics::MenuProperties configMenuProperties;
+		configMenuProperties.cols = 1;
+		configMenuProperties.rows = 4;
+		configMenuProperties.charsPerEntry = 8;
+		configMenuProperties.rowGap = 32;
+		configMenuProperties.cursor = &menuCursor;
+		configMenuProperties.font = &menuFont;
+		configMenuProperties.wrapY = true;
+		menuResources.configMenuProperties = &configMenuProperties;
+
+		menuResources.configMessageSpeedLabel = "MESSAGE\n   SPEED";
+		menuResources.configMessageSpeedFast = "FAST";
+		menuResources.configMessageSpeedNormal = "NORMAL";
+		menuResources.configMessageSpeedSlow = "SLOW";
+		menuResources.configBattleCursorLabel = "BATTLE\n  CURSOR";
+		menuResources.configStatusCursorLabel = "STATUS\n  CURSOR";
+		menuResources.configCursorClear = "CLEAR";
+		menuResources.configCursorMemory = "MEMORY";
+		menuResources.configMusicLabel = "MUSIC";
+		menuResources.configMusicStereo = "STEREO";
+		menuResources.configMusicMono = "MONO";
+
+		graphics::MenuProperties scenarioMenuProperties;
+		scenarioMenuProperties.cols = 1;
+		scenarioMenuProperties.rows = 6;
+		scenarioMenuProperties.charsPerEntry = 14;
+		scenarioMenuProperties.rowGap = 8;
+		scenarioMenuProperties.cursor = &menuCursor;
+		scenarioMenuProperties.font = &menuFont;
+		menuResources.scenarioMenuProperties = &scenarioMenuProperties;
+		menuResources.scenarioMenuHeadline = "SCENARIO ITEM";
+
 		InitScreen screen(width, height);
 
 		app::State *state(0);