From 0eadcefc0d1a933daf728dee8abb6b2eaa7f5b48 Mon Sep 17 00:00:00 2001
From: Wanne <Wanne@3b4a5df2-a311-0410-b5c6-a8a6f20db521>
Date: Sun, 20 Aug 2006 19:46:17 +0000
Subject: [PATCH] Bobby Rays Filter Buttons: Removed "Heavy Weapons" filter
 from ammo, renamed "LMG" to "MG", removed "Ammo" filter from Used items.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@457 3b4a5df2-a311-0410-b5c6-a8a6f20db521
---
 JA2.suo                | Bin 93184 -> 94720 bytes
 Laptop/BobbyRGuns.cpp  |  28 ++++++++++++++--------------
 Utils/Text.h           |   4 ++--
 Utils/_DutchText.cpp   |   8 ++++----
 Utils/_EnglishText.cpp |   8 ++++----
 Utils/_FrenchText.cpp  |   8 ++++----
 Utils/_GermanText.cpp  |   8 ++++----
 Utils/_ItalianText.cpp |   8 ++++----
 Utils/_PolishText.cpp  |   8 ++++----
 Utils/_RussianText.cpp |   8 ++++----
 10 files changed, 44 insertions(+), 44 deletions(-)

diff --git a/JA2.suo b/JA2.suo
index 385cf759ebfd20278f00431db0a0a32e28651a21..489685e326755603d6754c094152b1179965dc8e 100644
GIT binary patch
delta 1982
zcmaJ?e@v8h82^6WyO;X`_a4W4at9o6peZwFkQITVF$5Jk6m0$oQIB6@U?CMNFh^ys
zKe8dO@|0`KVXMq#+7(CtG~77ypO&tzwYeEC|ESf{)mkb8dfo#$<-K+9KKDM~@8@}*
z@ALijd3%47dvD0+*Ge{32r)H1J)Nlqq-@#8EqmyIGy&z*jZ4z8(J`2~OB@Mxo4c(E
zN7<|`3f)bz!kHleA&xVBlHm!tlwah8v+S^Gv36HIgxlIH?jG6A9qpkz?uSi99!ZEq
zMiRrpP#8`|GQ-74VW<o@V*w+Tp;tB)D)64hV7f9`EDh$Re6i|fMY7vM-Ibj|vz>iH
zx6c0Q#ZC>8b=v4?Dz)3-rfV{CwOgY{EFGdu6pNkOfy+hOp-Dv>_h*Hg#%>pCpG+o)
z+NX{~8;LwceF_w9YsB|JaI!WWSw8@nX?qTq)4m;8t#w2aFsu(1>;G*7yaN)J$#3&q
zPiO@V**Hu!5(=$fa>s`Z>XYD>KV|DH?M%Z$*J-x&nGNwftlJlY3qh~#z+!sVhSYn-
zC!ZL`>o_<&+7mOios*GF&w%S0kueSzUAMtQw=6K5>^xGb9hu~8Knk4+B4x;ewXprm
zizM?NnKYN8+U~GhVj{N)6}(WdT4B+W6*s+W#iFQj*@|J?<UOxw%uQ|yJto@f<W?`k
zL>Dc1g!WirmL}{p;znQi9XmRmA1#G6kdDn*5w1zc=T2(y!XNf8!^u=UPRBgZsJe`&
zW}dUV9H+QI{inZ|g|CzWpkK@3MRZKcuYg(BOP?v>FSaHa4!xj+_gzAqacPQ@nl{AY
zBeSXWbl;tQEam1mpIz&s>j}u#lt}U1>SR5**yJ<g+(0EVe0k=h66c<t&XB~tROj1D
zq)Y83Qn;`Z`G~pr;<&uA5v}*RWX5r^1W*GtD-P3EtuxtinC~~~jNix*Ge4587M-!W
za*S?asznfLZX71@Y3zWy(8$cB4zzOW!=`>jS7njWEqt{VRiNLuz~O($NV84|OOn1F
zLbTFI3w|cwlUOPTL{N0lo>tUR{YI$!7XN=}EqX+SC=mJltPqciGC3+iqA8l#Bi=HN
z%~Z(BGJoG<B}k$e{TWsC=2lFrtUvQT!?X<rP+64>%+>Aq8ab?0^O;z7A^gyK|E{9<
z>ak0g6*D!~;b3fISmowNhbQXv5n1~T%$j=mK|R}GQ&|=bbk8mnL1nQtFyHRR_Srzz
zQ3Jg)$hR}Lr7X<`mya7z3e_8jnP}95=Wa<_9GAV#d`oD}dagS?4jpPi0CXXM+<_(V
zl3B({wCg%YySE^TdS#@?l$b6ju$*07i3Rk*UgX&I&rXoh2K~nS|6yG+^Wm~ZPeJU)
z^I<9HgHo<tSye)gz35M?5if~mex4J4{wO>z_VW|uR@2N8TvrX3e~Gc$`!}~XdU`#z
zoMj(Jws4kC(a5d+dS2SR3A<@SHJoamF%R*q|L~M@5ifF>U+76*V5?npiRQUmV5J`%
Q*hu3Jtd9HFmxSg20aDt~jQ{`u

delta 1589
zcma)5Yitx%6u#eVXLqM8)5i?mvTWP!gNL;Qi;@;-tkeQkx7tO16b!TrB|Jl5!w)Eg
zEDw{Kn5JPY2NM#d0Zb%Tbc~~kLHt2YOw<|^H8x^Jf0(GWiN<Ifx}LjzP}~XOCMP-f
ze&0FwJLjI8{6$TEr(SJTw6G9jB9%&+R<lx~X7jGdKB$aC&;9no7oKYa@bFRcq}`d-
z>G!_OeqF6S7Vsk{C;%Zo(}eh%P1t$*&#L!L_7+F1G2=M8tRv=8)!>5z_P^%C9!%I+
zG=#p8-dCC5w?wf<LjgNbw@+7YsdneniFlTjVUJ$9U1+u6I7bN;5q8RYucFCH4Axr5
z@95TWq}c8l_@~C|DmCo`6Fs2(GAyS`pm8RE_GjUw+&xP@)hMQ$UX;;R4LS|(LDn?Q
zdsaaeUa^*LD^X9g$X<#msPRh;a#4>06Sj3}Te)_T;rG}k-ia>*?c0kmZCH<fx*kFW
z^;g5B+C4a*PK*$Jtl}p%m+5n@Jl*hdj|6wsir*-OpcCs*^1cs^&_)#@#@HZP+9*^0
zVoS%+F+cn$kN}<YqXI=~chHXywA)NdO%t_Sv%|D@-W_7grcZoW=KY@Ck!-qdqQ~jZ
zMk42I7%f=t#KL$x=W+-NMV6w$X{f^C0tB6}o`eSabu9|%d=TxFoX5>-2_ct;ALoAd
zHz05i3u&#|4}8lXY;y_g5H$amE|)CV=T{!fAG!9{&E7oJzFV0DB{!qVFcl$3O0KTe
z-TLcw-8v0z#=<;Fl_T}wC2Er;PPOfSQXX=XGA&8obFcEiY`RrlvVvB;fGDkb9_92=
zGv@fG#X2=jcmy;OgJwiBYjI9Jg<Vr{sSE6T1~C|AijadL*G%5MQHhkhAYV31q#_d`
zM!q4f1&MH%X8_#$RBB-+&7l^=VJvb%=4`+w7>hFznfj%bYWkClj<nLCIPEzzc}ad|
zWwIV$AWamjaArZ2UTj5*s@i7vjy9nhZX@9E2z-drdH2h!hzP9YpHX_X4O@Gk;PKqP
z1;-{|q98NS8Q&r=3%VfnZHR!Li}Di|y1+-<u@c677v$48TBia-F7WE@{KM$S9h`T8
z3;ae0*1!n6AmckYFg(-VA{WZeopS8bxr;Ml`fWdcr`L8PPB9(zRKF3)yECyQ^L?G6
SjfjGVALajEzYDDokoiC2!Hx0&

diff --git a/Laptop/BobbyRGuns.cpp b/Laptop/BobbyRGuns.cpp
index 9ce7bc67..b7ff0f6f 100644
--- a/Laptop/BobbyRGuns.cpp
+++ b/Laptop/BobbyRGuns.cpp
@@ -138,16 +138,16 @@ BobbyRayPurchaseStruct BobbyRayPurchases[ MAX_PURCHASE_AMOUNT ];
 // WANNE
 #define		FILTER_BUTTONS_GUN_START_X				BOBBYR_PREVIOUS_BUTTON_X
 #define		FILTER_BUTTONS_AMMO_START_X				FILTER_BUTTONS_GUN_START_X
-#define		FILTER_BUTTONS_USED_START_X				FILTER_BUTTONS_GUN_START_X + 122
+#define		FILTER_BUTTONS_USED_START_X				FILTER_BUTTONS_GUN_START_X	//FILTER_BUTTONS_GUN_START_X + 122
 #define		FILTER_BUTTONS_Y						BOBBYR_PREVIOUS_BUTTON_Y + 25
 
 // WANNE
 // The number of filter buttons which category uses
 #define		NUMBER_GUNS_FILTER_BUTTONS			9
-#define		NUMBER_AMMO_FILTER_BUTTONS			9
+#define		NUMBER_AMMO_FILTER_BUTTONS			8
 #define		NUMBER_ARMOUR_FILTER_BUTTONS		1
 #define		NUMBER_MISC_FILTER_BUTTONS			1
-#define		NUMBER_USED_FILTER_BUTTONS			4
+#define		NUMBER_USED_FILTER_BUTTONS			3
 
 // WANNE
 #define		BOBBYR_GUNS_FILTER_BUTTON_GAP			BOBBYR_CATALOGUE_BUTTON_GAP - 1
@@ -186,7 +186,7 @@ INT8			ubFilterGunsButtonValues[] = {
 
 // WANNE
 INT8			ubFilterAmmoButtonValues[] = {
-							BOBBYR_FILTER_AMMO_HEAVY,
+							//BOBBYR_FILTER_AMMO_HEAVY,
 							BOBBYR_FILTER_AMMO_PISTOL,
 							BOBBYR_FILTER_AMMO_M_PISTOL,
 							BOBBYR_FILTER_AMMO_SMG,
@@ -198,7 +198,7 @@ INT8			ubFilterAmmoButtonValues[] = {
 
 INT8			ubFilterUsedButtonValues[] = {
 							BOBBYR_FILTER_USED_GUNS,
-							BOBBYR_FILTER_USED_AMMO,
+							//BOBBYR_FILTER_USED_AMMO,
 							BOBBYR_FILTER_USED_ARMOR,
 							BOBBYR_FILTER_USED_MISC};
 
@@ -538,7 +538,7 @@ BOOLEAN InitBobbyRAmmoFilterBar()
 		}
 
 		// Filter buttons
-		guiBobbyRFilterAmmo[i] = CreateIconAndTextButton( guiBobbyRFilterImage, BobbyRFilter[BOBBYR_FILTER_AMMO_HEAVY+i], BOBBYR_GUNS_BUTTON_FONT, 
+		guiBobbyRFilterAmmo[i] = CreateIconAndTextButton( guiBobbyRFilterImage, BobbyRFilter[BOBBYR_FILTER_AMMO_PISTOL+i], BOBBYR_GUNS_BUTTON_FONT, 
 													BOBBYR_GUNS_TEXT_COLOR_ON, BOBBYR_GUNS_SHADOW_COLOR, 
 													BOBBYR_GUNS_TEXT_COLOR_OFF, BOBBYR_GUNS_SHADOW_COLOR, 
 													TEXT_CJUSTIFIED, 
@@ -919,9 +919,9 @@ void BtnBobbyRFilterAmmoCallback(GUI_BUTTON *btn,INT32 reason)
 		
 		switch (bNewValue)
 		{
-			case BOBBYR_FILTER_AMMO_HEAVY:
-				guiCurrentAmmoFilterMode = NOT_GUN;
-				break;
+			//case BOBBYR_FILTER_AMMO_HEAVY:
+			//	guiCurrentAmmoFilterMode = NOT_GUN;
+			//	break;
 			case BOBBYR_FILTER_AMMO_PISTOL:
 				guiCurrentAmmoFilterMode = GUN_PISTOL;
 				break;
@@ -990,9 +990,9 @@ void BtnBobbyRFilterUsedCallback(GUI_BUTTON *btn,INT32 reason)
 			case BOBBYR_FILTER_USED_GUNS:
 				guiCurrentUsedFilterMode = IC_BOBBY_GUN;
 				break;
-			case BOBBYR_FILTER_USED_AMMO:
-				guiCurrentUsedFilterMode = IC_AMMO;
-				break;
+			//case BOBBYR_FILTER_USED_AMMO:
+			//	guiCurrentUsedFilterMode = IC_AMMO;
+			//	break;
 			case BOBBYR_FILTER_USED_ARMOR:
 				guiCurrentUsedFilterMode = IC_ARMOUR;
 				break;
@@ -2595,13 +2595,13 @@ void UpdateAmmoFilterButtons(INT32 iNewButton, INT32 iOldButton)
 		if (iNewButton > -1)
 		{
 			// Disable new Button
-			DisableButton(guiBobbyRFilterAmmo[iNewButton]);
+			DisableButton(guiBobbyRFilterAmmo[iNewButton - 1]);
 		}
 
 		if (iOldButton > -1)
 		{
 			// Enable old Button
-			EnableButton(guiBobbyRFilterAmmo[iOldButton]);
+			EnableButton(guiBobbyRFilterAmmo[iOldButton - 1]);
 		}
 	}
 }
diff --git a/Utils/Text.h b/Utils/Text.h
index 8ede085a..555b3395 100644
--- a/Utils/Text.h
+++ b/Utils/Text.h
@@ -760,7 +760,7 @@ enum
 	BOBBYR_FILTER_GUNS_LMG,
 	BOBBYR_FILTER_GUNS_SHOTGUN,
 	// Ammo
-	BOBBYR_FILTER_AMMO_HEAVY,
+	//BOBBYR_FILTER_AMMO_HEAVY,
 	BOBBYR_FILTER_AMMO_PISTOL,
 	BOBBYR_FILTER_AMMO_M_PISTOL,
 	BOBBYR_FILTER_AMMO_SMG,
@@ -771,7 +771,7 @@ enum
 	BOBBYR_FILTER_AMMO_SHOTGUN,
 	// Used
 	BOBBYR_FILTER_USED_GUNS,
-	BOBBYR_FILTER_USED_AMMO,
+	//BOBBYR_FILTER_USED_AMMO,
 	BOBBYR_FILTER_USED_ARMOR,
 	BOBBYR_FILTER_USED_MISC,
 };
diff --git a/Utils/_DutchText.cpp b/Utils/_DutchText.cpp
index a62d576d..95fd40da 100644
--- a/Utils/_DutchText.cpp
+++ b/Utils/_DutchText.cpp
@@ -2809,23 +2809,23 @@ STR16			BobbyRFilter[] =
 	L"Rifle",
 	L"SN Rifle",
 	L"AS Rifle",
-	L"LMG",
+	L"MG",
 	L"Shotgun",
 
 	// Ammo
-	L"Heavy W.",
+	//L"Heavy W.",
 	L"Pistol",
 	L"M. Pistol",
 	L"SMG",
 	L"Rifle",
 	L"SN Rifle",
 	L"AS Rifle",
-	L"LMG",
+	L"MG",
 	L"Shotgun",
 
 	// Used
 	L"Guns",
-	L"Ammo",
+	//L"Ammo",
 	L"Armor",
 	L"Misc",
 };
diff --git a/Utils/_EnglishText.cpp b/Utils/_EnglishText.cpp
index 3ed9d8eb..08edbc2d 100644
--- a/Utils/_EnglishText.cpp
+++ b/Utils/_EnglishText.cpp
@@ -2809,23 +2809,23 @@ STR16			BobbyRFilter[] =
 	L"Rifle",
 	L"SN Rifle",
 	L"AS Rifle",
-	L"LMG",
+	L"MG",
 	L"Shotgun",
 
 	// Ammo
-	L"Heavy W.",
+	//L"Heavy W.",
 	L"Pistol",
 	L"M. Pistol",
 	L"SMG",
 	L"Rifle",
 	L"SN Rifle",
 	L"AS Rifle",
-	L"LMG",
+	L"MG",
 	L"Shotgun",
 
 	// Used
 	L"Guns",
-	L"Ammo",
+	//L"Ammo",
 	L"Armor",
 	L"Misc",
 };
diff --git a/Utils/_FrenchText.cpp b/Utils/_FrenchText.cpp
index 396d2f75..13e5cff2 100644
--- a/Utils/_FrenchText.cpp
+++ b/Utils/_FrenchText.cpp
@@ -2798,23 +2798,23 @@ STR16			BobbyRFilter[] =
 	L"Rifle",
 	L"SN Rifle",
 	L"AS Rifle",
-	L"LMG",
+	L"MG",
 	L"Shotgun",
 
 	// Ammo
-	L"Heavy W.",
+	//L"Heavy W.",
 	L"Pistol",
 	L"M. Pistol",
 	L"SMG",
 	L"Rifle",
 	L"SN Rifle",
 	L"AS Rifle",
-	L"LMG",
+	L"MG",
 	L"Shotgun",
 
 	// Used
 	L"Guns",
-	L"Ammo",
+	//L"Ammo",
 	L"Armor",
 	L"Misc",
 };
diff --git a/Utils/_GermanText.cpp b/Utils/_GermanText.cpp
index ad5e2831..63be6d8e 100644
--- a/Utils/_GermanText.cpp
+++ b/Utils/_GermanText.cpp
@@ -2670,23 +2670,23 @@ STR16			BobbyRFilter[] =
 	L"Gewehr",
 	L"SS Gewehr",
 	L"Sturmgew.",
-	L"LMG",
+	L"MG",
 	L"Schrotfl.",
 
 	// Ammo
-	L"Schwere W.",
+	//L"Schwere W.",
 	L"Pistole",
 	L"M. Pistole",
 	L"SMG",
 	L"Gewehr",
 	L"SS Gewehr",
 	L"Sturmgew.",
-	L"LMG",
+	L"MG",
 	L"Schrotfl.",
 
 	// Used
 	L"Feuerwfn.",
-	L"Munition",
+	//L"Munition",
 	L"Rüstung",
 	L"Sonstiges",
 };
diff --git a/Utils/_ItalianText.cpp b/Utils/_ItalianText.cpp
index f0f0be79..6dad93de 100644
--- a/Utils/_ItalianText.cpp
+++ b/Utils/_ItalianText.cpp
@@ -2793,23 +2793,23 @@ STR16			BobbyRFilter[] =
 	L"Rifle",
 	L"SN Rifle",
 	L"AS Rifle",
-	L"LMG",
+	L"MG",
 	L"Shotgun",
 
 	// Ammo
-	L"Heavy W.",
+	//L"Heavy W.",
 	L"Pistol",
 	L"M. Pistol",
 	L"SMG",
 	L"Rifle",
 	L"SN Rifle",
 	L"AS Rifle",
-	L"LMG",
+	L"MG",
 	L"Shotgun",
 
 	// Used
 	L"Guns",
-	L"Ammo",
+	//L"Ammo",
 	L"Armor",
 	L"Misc",
 };
diff --git a/Utils/_PolishText.cpp b/Utils/_PolishText.cpp
index c9c037d9..d5733899 100644
--- a/Utils/_PolishText.cpp
+++ b/Utils/_PolishText.cpp
@@ -2791,23 +2791,23 @@ STR16			BobbyRFilter[] =
 	L"Rifle",
 	L"SN Rifle",
 	L"AS Rifle",
-	L"LMG",
+	L"MG",
 	L"Shotgun",
 
 	// Ammo
-	L"Heavy W.",
+	//L"Heavy W.",
 	L"Pistol",
 	L"M. Pistol",
 	L"SMG",
 	L"Rifle",
 	L"SN Rifle",
 	L"AS Rifle",
-	L"LMG",
+	L"MG",
 	L"Shotgun",
 
 	// Used
 	L"Guns",
-	L"Ammo",
+	//L"Ammo",
 	L"Armor",
 	L"Misc",
 };
diff --git a/Utils/_RussianText.cpp b/Utils/_RussianText.cpp
index a9f11796..d0f5390f 100644
--- a/Utils/_RussianText.cpp
+++ b/Utils/_RussianText.cpp
@@ -2800,23 +2800,23 @@ STR16			BobbyRFilter[] =
 	L"Rifle",
 	L"SN Rifle",
 	L"AS Rifle",
-	L"LMG",
+	L"MG",
 	L"Shotgun",
 
 	// Ammo
-	L"Heavy W.",
+	//L"Heavy W.",
 	L"Pistol",
 	L"M. Pistol",
 	L"SMG",
 	L"Rifle",
 	L"SN Rifle",
 	L"AS Rifle",
-	L"LMG",
+	L"MG",
 	L"Shotgun",
 
 	// Used
 	L"Guns",
-	L"Ammo",
+	//L"Ammo",
 	L"Armor",
 	L"Misc",
 };