- Bobby Ray Bugfixes (by Buggler)

o Fixed enabling/disabling filter buttons
o Rearranged BR's Guns sorting buttons to have same layout as Ammo's, e.g. 'Heavy W.' becoming last button
o Shifted 'Subtotal' to accomodate 7 figures in browsing screen
o Reassigned weird cheatmode financing key. New key: '=' +10k; '+' +100k; '-' -10k; '_' -100k. Formerly: '=' +100k; '-' -10k


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4682 3b4a5df2-a311-0410-b5c6-a8a6f20db521

Utils/Text.h

@@ -987,7 +987,6 @@ extern		STR16			BobbyROrderFormText[];
 enum
 {
 	// Guns
-	BOBBYR_FILTER_GUNS_HEAVY,
 	BOBBYR_FILTER_GUNS_PISTOL,
 	BOBBYR_FILTER_GUNS_M_PISTOL,
 	BOBBYR_FILTER_GUNS_SMG,
@@ -996,8 +995,8 @@ enum
 	BOBBYR_FILTER_GUNS_AS_RIFLE,
 	BOBBYR_FILTER_GUNS_LMG,
 	BOBBYR_FILTER_GUNS_SHOTGUN,
+	BOBBYR_FILTER_GUNS_HEAVY,
 	// Ammo
-	//BOBBYR_FILTER_AMMO_HEAVY,
 	BOBBYR_FILTER_AMMO_PISTOL,
 	BOBBYR_FILTER_AMMO_M_PISTOL,
 	BOBBYR_FILTER_AMMO_SMG,
@@ -1006,6 +1005,7 @@ enum
 	BOBBYR_FILTER_AMMO_AS_RIFLE,
 	BOBBYR_FILTER_AMMO_LMG,
 	BOBBYR_FILTER_AMMO_SHOTGUN,
+	//BOBBYR_FILTER_AMMO_HEAVY,
 	// Used
 	BOBBYR_FILTER_USED_GUNS,
 	BOBBYR_FILTER_USED_ARMOR,

Utils/_ChineseText.cpp

@@ -4210,7 +4210,6 @@ STR16			BobbyROrderFormText[] =
 STR16			BobbyRFilter[] =
 {
 	// Guns
-	L"重武器", //"Heavy W.",
 	L"手枪", //"Pistol",
 	L"自动手枪", //"M. Pistol",
 	L"冲锋枪", //"SMG",
@@ -4219,6 +4218,7 @@ STR16			BobbyRFilter[] =
 	L"突击歩枪", //"AS Rifle",
 	L"机枪", //"MG",
 	L"霰弹枪", //"Shotgun",
+	L"重武器", //"Heavy W.",
 
 	// Ammo
 	L"手枪", //"Pistol",

Utils/_DutchText.cpp

@@ -4207,7 +4207,6 @@ STR16			BobbyROrderFormText[] =
 STR16			BobbyRFilter[] =
 {
 	// Guns
-	L"Heavy W.",
 	L"Pistol",
 	L"M. Pistol",
 	L"SMG",
@@ -4216,6 +4215,7 @@ STR16			BobbyRFilter[] =
 	L"AS Rifle",
 	L"MG",
 	L"Shotgun",
+	L"Heavy W.",
 
 	// Ammo
 	L"Pistol",

Utils/_EnglishText.cpp

@@ -4211,7 +4211,6 @@ STR16			BobbyROrderFormText[] =
 STR16			BobbyRFilter[] =
 {
 	// Guns
-	L"Heavy W.",
 	L"Pistol",
 	L"M. Pistol",
 	L"SMG",
@@ -4220,6 +4219,7 @@ STR16			BobbyRFilter[] =
 	L"AS Rifle",
 	L"MG",
 	L"Shotgun",
+	L"Heavy W.",
 
 	// Ammo
 	L"Pistol",

Utils/_FrenchText.cpp

@@ -4212,7 +4212,6 @@ STR16			BobbyROrderFormText[] =
 STR16			BobbyRFilter[] =
 {
 	// Guns
-	L"Arm.Lourd",
 	L"Arm.poing",
 	L"Pist. M.",
 	L"Mitraill.",
@@ -4221,6 +4220,7 @@ STR16			BobbyRFilter[] =
 	L"F.d'assa.",
 	L"M. légère",
 	L"F.à pompe",
+	L"Arm.Lourd",
 
 	// Ammo
 	L"Arm.poing",

Utils/_GermanText.cpp

@@ -4111,7 +4111,6 @@ STR16 BobbyROrderFormText[] =
 STR16			BobbyRFilter[] =
 {
 	// Guns
-	L"Schwere W.",
 	L"Pistolen",
 	L"MPs",
 	L"SMGs",
@@ -4120,6 +4119,7 @@ STR16			BobbyRFilter[] =
 	L"Sturmgew.",
 	L"MGs",
 	L"Schrotfl.",
+	L"Schwere W.",
 
 	// Ammo
 	L"Pistole",

Utils/_ItalianText.cpp

@@ -4202,7 +4202,6 @@ STR16			BobbyROrderFormText[] =
 STR16			BobbyRFilter[] =
 {
 	// Guns
-	L"Heavy W.",
 	L"Pistol",
 	L"M. Pistol",
 	L"SMG",
@@ -4211,6 +4210,7 @@ STR16			BobbyRFilter[] =
 	L"AS Rifle",
 	L"MG",
 	L"Shotgun",
+	L"Heavy W.",
 
 	// Ammo
 	L"Pistol",

Utils/_PolishText.cpp

@@ -4210,7 +4210,6 @@ STR16			BobbyROrderFormText[] =
 STR16			BobbyRFilter[] =
 {
 	// Guns
-	L"Inny",
 	L"Pistolet",
 	L"Pistolet maszynowy",
 	L"Karabin maszynowy",
@@ -4219,6 +4218,7 @@ STR16			BobbyRFilter[] =
 	L"Karabin bojowy",
 	L"Lekki karabin maszynowy",
 	L"Strzelba",
+	L"Inny",
 
 	// Ammo
 	L"Pistolet",

Utils/_RussianText.cpp

@@ -4207,7 +4207,6 @@ STR16			BobbyROrderFormText[] =
 STR16			BobbyRFilter[] =
 {
 	// Guns
-	L"Тяжелое",
 	L"Пистолеты",
 	L"Авт.пистол.",
 	L"ПП",
@@ -4216,6 +4215,7 @@ STR16			BobbyRFilter[] =
 	L"Шт.винтовки",
 	L"Пулеметы",
 	L"Ружья",
+	L"Тяжелое",
 
 	// Ammo
 	L"Пистолеты",

Utils/_TaiwaneseText.cpp

@@ -4212,7 +4212,6 @@ STR16			BobbyROrderFormText[] =
 STR16			BobbyRFilter[] =
 {
 	// Guns
-	L"Heavy W.",
 	L"Pistol",
 	L"M. Pistol",
 	L"SMG",
@@ -4221,6 +4220,7 @@ STR16			BobbyRFilter[] =
 	L"AS Rifle",
 	L"MG",
 	L"Shotgun",
+	L"Heavy W.",
 
 	// Ammo
 	L"Pistol",