- feature: Added armor filter buttons (helm, vest, legging, plate) to Bobby Rays

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

Laptop/BobbyRAmmo.cpp

@@ -91,6 +91,8 @@ void RenderBobbyRAmmo()
 
 	DisplayItemInfo(IC_AMMO, guiCurrentAmmoFilterMode);
 	UpdateButtonText(guiCurrentLaptopMode);
+	
+	// WANNE
 	UpdateAmmoFilterButtons(guiCurrentAmmoFilterMode, guiPrevAmmoFilterMode);
 
 	MarkButtonsDirty( );

Laptop/BobbyRArmour.cpp

@@ -23,6 +23,7 @@ void GameInitBobbyRArmour()
 
 }
 
+// WANNE
 BOOLEAN EnterBobbyRArmour()
 {
   VOBJECT_DESC    VObjectDesc;
@@ -42,10 +43,12 @@ BOOLEAN EnterBobbyRArmour()
 	guiPrevArmourFilterMode = -1;
 	guiCurrentArmourFilterMode = -1;
 
+	SetFirstLastPagesForNew( IC_ARMOUR, guiCurrentArmourFilterMode );
+
 	//Draw menu bar
 	InitBobbyMenuBar( );
-
+	// WANNE
-	SetFirstLastPagesForNew( IC_ARMOUR, guiCurrentArmourFilterMode );
+	InitBobbyRArmourFilterBar();
 
 	RenderBobbyRArmour( );
 
@@ -58,6 +61,9 @@ void ExitBobbyRArmour()
 	DeleteVideoObjectFromIndex(guiArmourGrid);
 	DeleteBobbyMenuBar();
 
+	// WANNE
+	DeleteBobbyRArmourFilter();
+
 	DeleteBobbyBrTitle();
 	DeleteMouseRegionForBigImage();
 
@@ -88,7 +94,7 @@ void RenderBobbyRArmour()
 	UpdateButtonText(guiCurrentLaptopMode);
 	// TODO
 
-	//UpdateGunFilterButtons(guiCurrentArmourFilterMode, guiPrevArmourFilterMode);
+	UpdateArmourFilterButtons(guiCurrentArmourFilterMode, guiPrevArmourFilterMode);
 
   MarkButtonsDirty( );
 	RenderWWWProgramTitleBar( );

Laptop/BobbyRGuns.cpp

@@ -139,13 +139,14 @@ BobbyRayPurchaseStruct BobbyRayPurchases[ MAX_PURCHASE_AMOUNT ];
 #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	//FILTER_BUTTONS_GUN_START_X + 122
+#define		FILTER_BUTTONS_ARMOUR_START_X			FILTER_BUTTONS_GUN_START_X
 #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			8
-#define		NUMBER_ARMOUR_FILTER_BUTTONS		1
+#define		NUMBER_ARMOUR_FILTER_BUTTONS		4
 #define		NUMBER_MISC_FILTER_BUTTONS			1
 #define		NUMBER_USED_FILTER_BUTTONS			3
 
@@ -153,6 +154,7 @@ BobbyRayPurchaseStruct BobbyRayPurchases[ MAX_PURCHASE_AMOUNT ];
 #define		BOBBYR_GUNS_FILTER_BUTTON_GAP			BOBBYR_CATALOGUE_BUTTON_GAP - 1
 #define		BOBBYR_AMMO_FILTER_BUTTON_GAP			BOBBYR_CATALOGUE_BUTTON_GAP - 1
 #define		BOBBYR_USED_FILTER_BUTTON_GAP			BOBBYR_CATALOGUE_BUTTON_GAP - 1
+#define		BOBBYR_ARMOUR_FILTER_BUTTON_GAP			BOBBYR_CATALOGUE_BUTTON_GAP - 1
 
 // WANNE
 UINT32	guiBobbyRFilterGuns[ NUMBER_GUNS_FILTER_BUTTONS ];
@@ -169,6 +171,7 @@ INT32		guiBobbyRFilterImage;
 void BtnBobbyRFilterGunsCallback(GUI_BUTTON *btn,INT32 reason);
 void BtnBobbyRFilterAmmoCallback(GUI_BUTTON *btn,INT32 reason);
 void BtnBobbyRFilterUsedCallback(GUI_BUTTON *btn,INT32 reason);
+void BtnBobbyRFilterArmourCallback(GUI_BUTTON *btn,INT32 reason);
 
 BOOLEAN IsAmmoMatchinWeaponType(UINT16 usItemIndex, UINT8 ubWeaponType);
 
@@ -186,7 +189,6 @@ INT8			ubFilterGunsButtonValues[] = {
 
 // WANNE
 INT8			ubFilterAmmoButtonValues[] = {
-							//BOBBYR_FILTER_AMMO_HEAVY,
 							BOBBYR_FILTER_AMMO_PISTOL,
 							BOBBYR_FILTER_AMMO_M_PISTOL,
 							BOBBYR_FILTER_AMMO_SMG,
@@ -198,10 +200,15 @@ INT8			ubFilterAmmoButtonValues[] = {
 
 INT8			ubFilterUsedButtonValues[] = {
 							BOBBYR_FILTER_USED_GUNS,
-							//BOBBYR_FILTER_USED_AMMO,
 							BOBBYR_FILTER_USED_ARMOR,
 							BOBBYR_FILTER_USED_MISC};
 
+INT8			ubFilterArmourButtonValues[] = {
+							BOBBYR_FILTER_ARMOUR_HELM,
+							BOBBYR_FILTER_ARMOUR_VEST,
+							BOBBYR_FILTER_ARMOUR_LEGGING,
+							BOBBYR_FILTER_ARMOUR_PLATE};
+
 						
 extern	BOOLEAN fExitingLaptopFlag;
 
@@ -307,10 +314,12 @@ void GameInitBobbyRGuns()
 	guiPrevGunFilterMode = -1;
 	guiPrevAmmoFilterMode = -1;
 	guiPrevUsedFilterMode = -1;
+	guiPrevArmourFilterMode = -1;
 
 	guiCurrentGunFilterMode = -1;
 	guiCurrentAmmoFilterMode = -1;
 	guiCurrentUsedFilterMode = -1;
+	guiCurrentArmourFilterMode = -1;
 
 	memset(&BobbyRayPurchases, 0, MAX_PURCHASE_AMOUNT);
 }
@@ -513,7 +522,6 @@ BOOLEAN InitBobbyRGunsFilterBar()
 	return(TRUE);
 }
 
-// WANNE
 BOOLEAN InitBobbyRAmmoFilterBar()
 {
 	UINT8	i;
@@ -557,6 +565,48 @@ BOOLEAN InitBobbyRAmmoFilterBar()
 	return(TRUE);
 }
 
+BOOLEAN InitBobbyRArmourFilterBar()
+{
+	UINT8	i;
+	UINT16	usPosX;
+	UINT8		bCurMode;
+	UINT16	usYOffset = 0;
+
+	bCurMode = 0;
+	usPosX = FILTER_BUTTONS_GUN_START_X;
+
+	guiBobbyRFilterImage =  LoadButtonImage("LAPTOP\\CatalogueButton1.sti", -1,0,-1,1,-1 );
+
+	// Loop through the filter buttons
+	for(i=0; i<NUMBER_ARMOUR_FILTER_BUTTONS; i++)
+	{
+		// Next row
+		if (i > 7)
+		{
+			usPosX = FILTER_BUTTONS_ARMOUR_START_X;
+			usYOffset = 25;
+		}
+
+		// Filter buttons
+		guiBobbyRFilterArmor[i] = CreateIconAndTextButton( guiBobbyRFilterImage, BobbyRFilter[BOBBYR_FILTER_ARMOUR_HELM+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, 
+													usPosX, FILTER_BUTTONS_Y + usYOffset, BUTTON_TOGGLE, MSYS_PRIORITY_HIGH,
+													DEFAULT_MOVE_CALLBACK, BtnBobbyRFilterArmourCallback);
+
+		SetButtonCursor(guiBobbyRFilterArmor[i], CURSOR_LAPTOP_SCREEN);
+
+		MSYS_SetBtnUserData( guiBobbyRFilterArmor[i], 0, ubFilterArmourButtonValues[bCurMode]);
+
+		usPosX += BOBBYR_ARMOUR_FILTER_BUTTON_GAP;
+		bCurMode++;
+	}
+	
+
+	return(TRUE);
+}
+
 
 BOOLEAN InitBobbyRUsedFilterBar()
 {
@@ -689,7 +739,6 @@ BOOLEAN DeleteBobbyRGunsFilter()
 	return (TRUE);
 }
 
-// WANNE
 BOOLEAN DeleteBobbyRAmmoFilter()
 {
 	UINT8	i;
@@ -718,6 +767,21 @@ BOOLEAN DeleteBobbyRUsedFilter()
 	return (TRUE);
 }
 
+BOOLEAN DeleteBobbyRArmourFilter()
+{
+	UINT8	i;
+
+	UnloadButtonImage( guiBobbyRFilterImage );
+
+	for (i=0; i<NUMBER_ARMOUR_FILTER_BUTTONS; i++)
+	{
+		RemoveButton (guiBobbyRFilterArmor[i]);
+	}
+
+	return (TRUE);
+}
+
+
 BOOLEAN DeleteBobbyMenuBar()
 {
 	UINT8	i;
@@ -741,6 +805,7 @@ BOOLEAN DeleteBobbyMenuBar()
 	return(TRUE);
 }
 
+// WANNE
 void BtnBobbyRPageMenuCallback(GUI_BUTTON *btn,INT32 reason)
 {
 	UINT32		bNewValue;
@@ -787,8 +852,7 @@ void BtnBobbyRPageMenuCallback(GUI_BUTTON *btn,INT32 reason)
 			case LAPTOP_MODE_BOBBY_R_ARMOR:
 				guiPrevArmourFilterMode = guiCurrentArmourFilterMode;
 				guiCurrentArmourFilterMode = -1;
-				// TODO
+				UpdateArmourFilterButtons(guiCurrentArmourFilterMode, guiPrevArmourFilterMode);
-				//UpdateAmmoFilterButtons(guiCurrentAmmoFilterMode, guiPrevAmmoFilterMode);
 				SetFirstLastPagesForNew(IC_ARMOUR, guiCurrentArmourFilterMode);
 				break;
 			case LAPTOP_MODE_BOBBY_R_MISC:
@@ -830,8 +894,6 @@ void BtnBobbyRFilterGunsCallback(GUI_BUTTON *btn,INT32 reason)
 	if (!(btn->uiFlags & BUTTON_ENABLED))
 		return;
 
-	//gbMessageDisplayed = TRUE;
-
 	if(reason & MSYS_CALLBACK_REASON_LBUTTON_DWN )
 	{
 		btn->uiFlags |= BUTTON_CLICKED_ON;
@@ -895,7 +957,6 @@ void BtnBobbyRFilterGunsCallback(GUI_BUTTON *btn,INT32 reason)
 	}
 } 
 
-// WANNE
 void BtnBobbyRFilterAmmoCallback(GUI_BUTTON *btn,INT32 reason)
 {
 	UINT32		bNewValue;
@@ -962,8 +1023,6 @@ void BtnBobbyRFilterAmmoCallback(GUI_BUTTON *btn,INT32 reason)
 	}
 } 
 
-
-// WANNE
 void BtnBobbyRFilterUsedCallback(GUI_BUTTON *btn,INT32 reason)
 {
 	UINT32		bNewValue;
@@ -1015,7 +1074,57 @@ void BtnBobbyRFilterUsedCallback(GUI_BUTTON *btn,INT32 reason)
 	}
 } 
 
+// WANNE
+void BtnBobbyRFilterArmourCallback(GUI_BUTTON *btn,INT32 reason)
+{
+	UINT32		bNewValue;
+	bNewValue = MSYS_GetBtnUserData( btn, 0 );
 
+	if (!(btn->uiFlags & BUTTON_ENABLED))
+		return;
+
+	if(reason & MSYS_CALLBACK_REASON_LBUTTON_DWN )
+	{
+		btn->uiFlags |= BUTTON_CLICKED_ON;
+
+		InvalidateRegion(btn->Area.RegionTopLeftX, btn->Area.RegionTopLeftY, btn->Area.RegionBottomRightX, btn->Area.RegionBottomRightY);
+	}
+	if(reason & MSYS_CALLBACK_REASON_LBUTTON_UP )
+	{
+		btn->uiFlags &= (~BUTTON_CLICKED_ON );
+
+		guiPrevArmourFilterMode = guiCurrentArmourFilterMode;
+
+		switch (bNewValue)
+		{
+			case BOBBYR_FILTER_ARMOUR_HELM:
+				guiCurrentArmourFilterMode = ARMOURCLASS_HELMET;
+				break;
+			case BOBBYR_FILTER_ARMOUR_VEST:
+				guiCurrentArmourFilterMode = ARMOURCLASS_VEST;
+				break;
+			case BOBBYR_FILTER_ARMOUR_LEGGING:
+				guiCurrentArmourFilterMode = ARMOURCLASS_LEGGINGS;
+				break;
+			case BOBBYR_FILTER_ARMOUR_PLATE:
+				guiCurrentArmourFilterMode = ARMOURCLASS_PLATE;
+				break;
+		}	
+
+		SetFirstLastPagesForNew(IC_ARMOUR, guiCurrentArmourFilterMode);
+		
+		UpdateArmourFilterButtons(guiCurrentArmourFilterMode, guiPrevArmourFilterMode);
+		
+		DeleteMouseRegionForBigImage();
+		fReDrawScreenFlag = TRUE;
+		fPausedReDrawScreenFlag = TRUE;
+	}
+	if(reason & MSYS_CALLBACK_REASON_LOST_MOUSE)
+	{
+		btn->uiFlags &= (~BUTTON_CLICKED_ON );
+		InvalidateRegion(btn->Area.RegionTopLeftX, btn->Area.RegionTopLeftY, btn->Area.RegionBottomRightX, btn->Area.RegionBottomRightY);
+	}
+} 
 
 void BtnBobbyRNextPreviousPageCallback(GUI_BUTTON *btn,INT32 reason)
 {
@@ -1061,7 +1170,7 @@ void BtnBobbyRNextPreviousPageCallback(GUI_BUTTON *btn,INT32 reason)
 	}
 } 
 
-
+// WANNE
 BOOLEAN DisplayItemInfo(UINT32 uiItemClass, INT32 iFilter)
 {
 	UINT16	i;
@@ -1111,8 +1220,6 @@ BOOLEAN DisplayItemInfo(UINT32 uiItemClass, INT32 iFilter)
 
 	}
 
-
-
 	for(i=gusCurWeaponIndex; ((i<=gusLastItemIndex) && (ubCount < 4)); i++)
 	{
 		bAddItem = FALSE;
@@ -1253,7 +1360,10 @@ BOOLEAN DisplayItemInfo(UINT32 uiItemClass, INT32 iFilter)
 				{
 					if (iFilter > -1)
 					{
-						// TODO
+						if (Armour[ Item[usItemIndex].ubClassIndex ].ubArmourClass == iFilter)
+						{
+							bAddItem = TRUE;
+						}
 					}
 				}
 
@@ -1831,7 +1941,7 @@ void CalculateFirstAndLastIndexs()
 }
 */
 
-
+// WANNE: Filter
 //Loops through Bobby Rays Inventory to find the first and last index 
 void SetFirstLastPagesForNew( UINT32 uiClassMask, INT32 iFilter )
 {
@@ -1878,15 +1988,19 @@ void SetFirstLastPagesForNew( UINT32 uiClassMask, INT32 iFilter )
 							break;
 						// Ammo
 						case IC_AMMO:
-							//if (Weapon[ Item[usItemIndex].ubClassIndex ].ubWeaponType == uiFilter)
+							if (IsAmmoMatchinWeaponType(usItemIndex, guiCurrentAmmoFilterMode))
 							{
-								if (IsAmmoMatchinWeaponType(usItemIndex, guiCurrentAmmoFilterMode))
+								bCntNumItems = TRUE;
-								{
+							}
-									bCntNumItems = TRUE;
+							break;
-								}
+						// Armour
+						case IC_ARMOUR:
+						// WANNE: TODO
+							if (Armour[ Item[usItemIndex].ubClassIndex ].ubArmourClass == iFilter)
+							{
+								bCntNumItems = TRUE;
 							}
 							break;
-							
 					}
 				}
 
@@ -1918,6 +2032,7 @@ void SetFirstLastPagesForNew( UINT32 uiClassMask, INT32 iFilter )
 		gubNumPages += 1;
 }
 
+// WANNE
 //Loops through Bobby Rays Used Inventory to find the first and last index 
 void SetFirstLastPagesForUsed(INT32 iFilter)
 {
@@ -2540,7 +2655,7 @@ void BtnBobbyRHomeButtonCallback(GUI_BUTTON *btn,INT32 reason)
 } 
 
 
-
+// WANNE
 void UpdateButtonText(UINT32	uiCurPage)
 {
 	switch( uiCurPage )
@@ -2568,7 +2683,14 @@ void UpdateButtonText(UINT32	uiCurPage)
 			break;
 
 		case LAPTOP_MODE_BOBBY_R_ARMOR:
-			DisableButton( guiBobbyRPageMenu[2] );
+			if (guiCurrentArmourFilterMode != -1)
+			{
+				EnableButton( guiBobbyRPageMenu[2] );
+			}
+			else
+			{
+				DisableButton( guiBobbyRPageMenu[2] );
+			}
 			break;
 
 		case LAPTOP_MODE_BOBBY_R_MISC:
@@ -2588,6 +2710,7 @@ void UpdateButtonText(UINT32	uiCurPage)
 	}
 }
 
+// WANNE
 void UpdateAmmoFilterButtons(INT32 iNewButton, INT32 iOldButton)
 {
 	if (iNewButton != iOldButton)
@@ -2633,32 +2756,40 @@ void UpdateUsedFilterButtons()
 
 			EnableButton(guiBobbyRFilterUsed[1]);
 			EnableButton(guiBobbyRFilterUsed[2]);
-			//EnableButton(guiBobbyRFilterUsed[3]);
 			break;
-		/*case IC_AMMO:
-			DisableButton(guiBobbyRFilterUsed[1]);
-
-			EnableButton(guiBobbyRFilterUsed[0]);
-			EnableButton(guiBobbyRFilterUsed[2]);
-			EnableButton(guiBobbyRFilterUsed[3]);
-			break;*/
 		case IC_ARMOUR:
 			DisableButton(guiBobbyRFilterUsed[1]);
 
 			EnableButton(guiBobbyRFilterUsed[0]);
 			EnableButton(guiBobbyRFilterUsed[2]);
-			//EnableButton(guiBobbyRFilterUsed[3]);
 			break;
 		case IC_BOBBY_MISC:
 			DisableButton(guiBobbyRFilterUsed[2]);
 
 			EnableButton(guiBobbyRFilterUsed[0]);
 			EnableButton(guiBobbyRFilterUsed[1]);
-			//EnableButton(guiBobbyRFilterUsed[2]);
 			break;
 	}
 }
 
+void UpdateArmourFilterButtons(INT32 iNewButton, INT32 iOldButton)
+{
+	if (iNewButton != iOldButton)
+	{
+		if (iNewButton > -1)
+		{
+			// Disable new Button
+			DisableButton(guiBobbyRFilterArmor[iNewButton]);
+		}
+
+		if (iOldButton > -1)
+		{
+			// Enable old Button
+			EnableButton(guiBobbyRFilterArmor[iOldButton]);
+		}
+	}
+}
+
 UINT16 CalcBobbyRayCost( UINT16 usIndex, UINT16 usBobbyIndex, BOOLEAN fUsed)
 {
 	DOUBLE value;
@@ -2725,6 +2856,7 @@ void DisableBobbyRButtons()
 */
 }
 
+// WANNE
 void CalcFirstIndexForPage( STORE_INVENTORY *pInv, UINT32	uiItemClass )
 {
 	UINT16	i;
@@ -2857,7 +2989,12 @@ void CalcFirstIndexForPage( STORE_INVENTORY *pInv, UINT32	uiItemClass )
 					}
 					else
 					{
-						// TODO
+						usItemIndex = LaptopSaveInfo.BobbyRayInventory[ i ].usItemIndex;
+
+						if (Armour[ Item[usItemIndex].ubClassIndex ].ubArmourClass == guiCurrentArmourFilterMode)
+						{
+							bCntItem = TRUE;
+						}
 					}
 				}
 				else if (uiItemClass == IC_BOBBY_MISC)
@@ -2904,29 +3041,18 @@ BOOLEAN IsAmmoMatchinWeaponType(UINT16 usItemIndex, UINT8 ubWeaponType)
 	
 	for (i = 0; i < MAXITEMS; i++)
 	{
-		//if( LaptopSaveInfo.BobbyRayInventory[ i ].ubQtyOnHand != 0 )
+		// We found the Weapon that uses this Ammo
+		if (Magazine[ Item[ usItemIndex ].ubClassIndex ].ubCalibre == Weapon[i].ubCalibre)
 		{
-			// We found the Weapon that uses this Ammo
+			// Weapon has the correct filter ammo weapon type
-			if (Magazine[ Item[ usItemIndex ].ubClassIndex ].ubCalibre == Weapon[i].ubCalibre)
+			if (Weapon[i].ubWeaponType == ubWeaponType)
 			{
-				// Weapon has the correct filter ammo weapon type
+				//Weapon has correct magazine size
-				if (Weapon[i].ubWeaponType == ubWeaponType)
+				if(Weapon[i].ubMagSize == Magazine[Item[usItemIndex].ubClassIndex].ubMagSize )
 				{
-					//Weapon has correct magazine size
+					bRetValue = TRUE;
-					if(Weapon[i].ubMagSize == Magazine[Item[usItemIndex].ubClassIndex].ubMagSize )
+					break;
-					{
-					    bRetValue = TRUE;
-						break;
-					}
 				}
-				// Weapon has another filter ammo weapon type
-				/*
-				else
-				{
-					bRetValue = FALSE;
-				}
-				break;
-				*/
 			}
 		}
 	}

Laptop/BobbyRGuns.h

@@ -41,9 +41,11 @@ void RenderBobbyRGuns();
 BOOLEAN DeleteBobbyRGunsFilter();
 BOOLEAN DeleteBobbyRAmmoFilter();
 BOOLEAN DeleteBobbyRUsedFilter();
+BOOLEAN DeleteBobbyRArmourFilter();
 BOOLEAN InitBobbyRGunsFilterBar();
 BOOLEAN InitBobbyRAmmoFilterBar();
 BOOLEAN InitBobbyRUsedFilterBar();
+BOOLEAN InitBobbyRArmourFilterBar();
 
 BOOLEAN DisplayBobbyRBrTitle();
 BOOLEAN DeleteBobbyBrTitle();
@@ -61,6 +63,7 @@ void UpdateButtonText(UINT32	uiCurPage);
 void UpdateAmmoFilterButtons(INT32 iNewButton, INT32 iOldButton);
 void UpdateGunFilterButtons(INT32 iNewButton, INT32 iOldButton);
 void UpdateUsedFilterButtons();
+void UpdateArmourFilterButtons(INT32 iNewButton, INT32 iOldButton);
 
 void EnterInitBobbyRGuns();
 void DailyUpdateOfBobbyRaysUsedInventory();

Utils/Text.h

@@ -818,9 +818,13 @@ enum
 	BOBBYR_FILTER_AMMO_SHOTGUN,
 	// Used
 	BOBBYR_FILTER_USED_GUNS,
-	//BOBBYR_FILTER_USED_AMMO,
 	BOBBYR_FILTER_USED_ARMOR,
 	BOBBYR_FILTER_USED_MISC,
+	// Armour
+	BOBBYR_FILTER_ARMOUR_HELM,
+	BOBBYR_FILTER_ARMOUR_VEST,
+	BOBBYR_FILTER_ARMOUR_LEGGING,
+	BOBBYR_FILTER_ARMOUR_PLATE,
 };
 
 

Utils/_DutchText.cpp

@@ -2820,7 +2820,6 @@ STR16			BobbyRFilter[] =
 	L"Shotgun",
 
 	// Ammo
-	//L"Heavy W.",
 	L"Pistol",
 	L"M. Pistol",
 	L"SMG",
@@ -2832,9 +2831,14 @@ STR16			BobbyRFilter[] =
 
 	// Used
 	L"Guns",
-	//L"Ammo",
 	L"Armor",
 	L"Misc",
+
+	// Armour
+	L"Helm",
+	L"Vest",
+	L"Legging",
+	L"Plate",
 };
 
 

Utils/_EnglishText.cpp

@@ -2820,7 +2820,6 @@ STR16			BobbyRFilter[] =
 	L"Shotgun",
 
 	// Ammo
-	//L"Heavy W.",
 	L"Pistol",
 	L"M. Pistol",
 	L"SMG",
@@ -2832,9 +2831,14 @@ STR16			BobbyRFilter[] =
 
 	// Used
 	L"Guns",
-	//L"Ammo",
 	L"Armor",
 	L"Misc",
+
+	// Armour
+	L"Helm",
+	L"Vest",
+	L"Legging",
+	L"Plate",
 };
 
 

Utils/_FrenchText.cpp

@@ -2809,7 +2809,6 @@ STR16			BobbyRFilter[] =
 	L"Shotgun",
 
 	// Ammo
-	//L"Heavy W.",
 	L"Pistol",
 	L"M. Pistol",
 	L"SMG",
@@ -2821,9 +2820,14 @@ STR16			BobbyRFilter[] =
 
 	// Used
 	L"Guns",
-	//L"Ammo",
 	L"Armor",
 	L"Misc",
+
+	// Armour
+	L"Helm",
+	L"Vest",
+	L"Legging",
+	L"Plate",
 };
 
 

Utils/_GermanText.cpp

@@ -2681,7 +2681,6 @@ STR16			BobbyRFilter[] =
 	L"Schrotfl.",
 
 	// Ammo
-	//L"Schwere W.",
 	L"Pistole",
 	L"M. Pistole",
 	L"SMG",
@@ -2693,9 +2692,14 @@ STR16			BobbyRFilter[] =
 
 	// Used
 	L"Feuerwfn.",
-	//L"Munition",
 	L"Rüstung",
 	L"Sonstiges",
+
+	// Armour
+	L"Helm",
+	L"Weste",
+	L"Hose",
+	L"Platte",
 };
 
 // This text is used when on the various Bobby Ray Web site pages that sell items

Utils/_ItalianText.cpp

@@ -2804,7 +2804,6 @@ STR16			BobbyRFilter[] =
 	L"Shotgun",
 
 	// Ammo
-	//L"Heavy W.",
 	L"Pistol",
 	L"M. Pistol",
 	L"SMG",
@@ -2816,9 +2815,14 @@ STR16			BobbyRFilter[] =
 
 	// Used
 	L"Guns",
-	//L"Ammo",
 	L"Armor",
 	L"Misc",
+
+	// Armour
+	L"Helm",
+	L"Vest",
+	L"Legging",
+	L"Plate",
 };
 
 // This text is used when on the various Bobby Ray Web site pages that sell items

Utils/_PolishText.cpp

@@ -2802,7 +2802,6 @@ STR16			BobbyRFilter[] =
 	L"Shotgun",
 
 	// Ammo
-	//L"Heavy W.",
 	L"Pistol",
 	L"M. Pistol",
 	L"SMG",
@@ -2814,9 +2813,14 @@ STR16			BobbyRFilter[] =
 
 	// Used
 	L"Guns",
-	//L"Ammo",
 	L"Armor",
 	L"Misc",
+
+	// Armour
+	L"Helm",
+	L"Vest",
+	L"Legging",
+	L"Plate",
 };
 
 

Utils/_RussianText.cpp

@@ -2823,9 +2823,14 @@ STR16			BobbyRFilter[] =
 
 	// Used
 	L"Guns",
-	//L"Ammo",
 	L"Armor",
 	L"Misc",
+
+	// Armour
+	L"Helm",
+	L"Vest",
+	L"Legging",
+	L"Plate",
 };
 
 

builddefines.h

@@ -17,19 +17,19 @@
 
 
 // Remove comment to build the editor!
-#ifdef _DEBUG
+//#ifdef _DEBUG
-	#ifndef JA2TESTVERSION
+//	#ifndef JA2TESTVERSION
-		#define JA2TESTVERSION
+//		#define JA2TESTVERSION
-	#endif
+//	#endif
-#endif
+//#endif
 
 // Remove comment to build the editor!
 
 // Do combinations
-#ifdef JA2TESTVERSION
+//#ifdef JA2TESTVERSION
-	#define JA2BETAVERSION
+//	#define JA2BETAVERSION
-	#define JA2EDITOR
+//	#define JA2EDITOR
-#endif
+//#endif