From: Daniel Karbach <daniel.karbach@localhorst.tv>
Date: Tue, 27 Nov 2012 13:04:09 +0000 (+0100)
Subject: added inactive menu font
X-Git-Url: http://git.localhorst.tv/?a=commitdiff_plain;h=0531ef59da95c2b572b8a1bad7b281fbd541f9dc;p=l2e.git

added inactive menu font
---

diff --git a/src/main.cpp b/src/main.cpp
index 08547d6..d0213e7 100644
--- 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,8 +431,6 @@ 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;
 		menuResources.equipmentMenuProperties = &equipmentMenuProperties;
 
diff --git a/src/menu/EquipMenu.cpp b/src/menu/EquipMenu.cpp
index 199b8e1..0caff55 100644
--- a/src/menu/EquipMenu.cpp
+++ b/src/menu/EquipMenu.cpp
@@ -287,7 +287,7 @@ void EquipMenu::LoadEquipment() {
 			const Item *item(GetHero().Equipment(Hero::EquipSlot(i)));
 			equipmentMenu.Add(item->Name(), item, true, item->MenuIcon());
 		} else {
-			equipmentMenu.Add(parent->Res().noEquipmentText, 0, false);
+			equipmentMenu.Add(parent->Res().noEquipmentText, 0);
 		}
 	}
 }
diff --git a/test-data/menu-font-inactive.png b/test-data/menu-font-inactive.png
new file mode 100644
index 0000000..7ffc57a
Binary files /dev/null and b/test-data/menu-font-inactive.png differ