From bb1b1eaf7e6b1aa9e32d716b7c8143eb657dabd1 Mon Sep 17 00:00:00 2001
From: Wanne <Wanne@3b4a5df2-a311-0410-b5c6-a8a6f20db521>
Date: Thu, 7 Feb 2008 07:58:03 +0000
Subject: [PATCH] - bugfix: Filter buttons under used category

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1782 3b4a5df2-a311-0410-b5c6-a8a6f20db521
---
 Laptop/BobbyRGuns.cpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/Laptop/BobbyRGuns.cpp b/Laptop/BobbyRGuns.cpp
index d4782e06..42dee5b7 100644
--- a/Laptop/BobbyRGuns.cpp
+++ b/Laptop/BobbyRGuns.cpp
@@ -2187,6 +2187,8 @@ void SetFirstLastPagesForUsed(INT32 iFilter)
 			}
 			else
 			{
+				bCntNumItems = FALSE;
+
 				// Get the weapon from the item
 				usItemIndex = LaptopSaveInfo.BobbyRayUsedInventory[ i ].usItemIndex;
 
@@ -3056,14 +3058,14 @@ void CalcFirstIndexForPage( STORE_INVENTORY *pInv, UINT32	uiItemClass )
 		//Get to the first index on the page
 		for(i=gusFirstItemIndex; i<=gusLastItemIndex; i++)
 		{
-			bCntItem = FALSE;
-
 			if (guiCurrentUsedFilterMode == -1)
 			{
 				bCntItem = TRUE;
 			}
 			else
 			{
+				bCntItem = FALSE;
+
 				usItemIndex = pInv[ i ].usItemIndex;
 
 				switch (guiCurrentUsedFilterMode)
@@ -3128,8 +3130,6 @@ void CalcFirstIndexForPage( STORE_INVENTORY *pInv, UINT32	uiItemClass )
 		//Get to the first index on the page
 		for(i=gusFirstItemIndex; i<=gusLastItemIndex; i++)
 		{
-			bCntItem = FALSE;
-
 			if( Item[ pInv[ i ].usItemIndex ].usItemClass & uiItemClass )
 			{
 				if (uiItemClass == IC_BOBBY_GUN)
@@ -3140,6 +3140,8 @@ void CalcFirstIndexForPage( STORE_INVENTORY *pInv, UINT32	uiItemClass )
 					}
 					else
 					{
+						bCntItem = FALSE;
+
 						usItemIndex = LaptopSaveInfo.BobbyRayInventory[ i ].usItemIndex;
 
 						if (Weapon[ Item[usItemIndex].ubClassIndex ].ubWeaponType == guiCurrentGunFilterMode)