made vector components writable

[l2e.git] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index 08547d6088a3ab529dcac49b3334d2fd1f7f0eba..68446d3f499518d5bc129f3475f1585ecda160ee 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -298,6 +298,8 @@ 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;
 
@@ -389,8 +391,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 +406,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 +431,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 +441,28 @@ 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";
+
                InitScreen screen(width, height);
 
                app::State *state(0);