From 0531ef59da95c2b572b8a1bad7b281fbd541f9dc Mon Sep 17 00:00:00 2001
From: Daniel Karbach <daniel.karbach@localhorst.tv>
Date: Tue, 27 Nov 2012 14:04:09 +0100
Subject: [PATCH] added inactive menu font

---
 src/main.cpp                     |  10 ++++------
 src/menu/EquipMenu.cpp           |   2 +-
 test-data/menu-font-inactive.png | Bin 0 -> 589 bytes
 3 files changed, 5 insertions(+), 7 deletions(-)
 create mode 100644 test-data/menu-font-inactive.png

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 0000000000000000000000000000000000000000..7ffc57ad2120a17712a882fe11aae3852c1f08d4
GIT binary patch
literal 589
zcmV-T0<!&yP)<h;3K|Lk000e1NJLTq00961003YC0{{R3$Ui>I00006P)t-s0001l
zX;N|l>ZJex00DGTPE!Ct=GbNc00H$$L_t(Y$F0`Qit{iGh2aD5_JD3h&~3rDF6eeH
z#xPrfzeVP!9hiwrKXsMlp^lEhiX=__UT6c*e*nJ>atHkRlJzP;Ti~S24e-Yjxd&b>
zT1C^k#!|<kY3lCjDKL~Vdb5x*<{L!p0F@BfvSj1?e0RZBZAV8dY1SR+JwS<A!YGaI
zUQ%-pSVk5`W#l`cb3ij=(HhYovEOh1JO}@!YIO9NV~rJ^Fhyo6Nsi^t0GTA|)NxZK
zvQpQ$V($PuNhPU+sKiC7%jH6{1Cr6HWb~LBW2wYYDsOq)17qDSL83~sQb}I+K=QNA
z{0u7WJ@6TI>WDfzJ=Ry$r{L8Z%^V$l{N?c*>lu*PU(In`Jsgi4AW2fH;~{B3oPMWZ
z^byntxT#3hGa!|hM5q!nZ=~vB2yB4wHp#r%DnAK$Poh=Ps<<Yq$EeT1|0zqy1e}tk
zQiUE*x@}OOgAnNn5Yx@#omR2j6opme>ZW&q99Ry+G=b{a^1Q{za5)3f#xk*VjJHxT
zReAF!un%CVSRcU8fOwB)v1q0+OjW?ln>lhg1NU{@h~GE<6ueTWpH#nsXqKB5)0i=g
ziS-OHCiwb1G4|sTv;{008SFPr{4kJDK{U$}*n$0qHPJJ`5>~V(@0z4hJ+`?6eq{T2
bc?SLgMi-3Yv5^aR00000NkvXXu0mjfG8zpZ

literal 0
HcmV?d00001

-- 
2.39.2