From 47c26ccdcf74f97e26e29ae20d09ec68b977ae79 Mon Sep 17 00:00:00 2001 From: MaddMugsy Date: Fri, 11 Aug 2006 19:53:06 +0000 Subject: [PATCH] -small tweak to BR fix to disable the notbuyable and itemclass = 0 filter on initial inventory setup so we can add new items later git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@427 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- GameVersion.cpp | 2 +- Laptop/BobbyR.cpp | 22 ++++++---------------- 2 files changed, 7 insertions(+), 17 deletions(-) diff --git a/GameVersion.cpp b/GameVersion.cpp index 46902553..0d1bea3c 100644 --- a/GameVersion.cpp +++ b/GameVersion.cpp @@ -23,7 +23,7 @@ INT16 zVersionLabel[256] = { L"Beta v. 0.98" }; #else //RELEASE BUILD VERSION - INT16 zVersionLabel[256] = { L"Release v1.13.426" }; + INT16 zVersionLabel[256] = { L"Release v1.13.427" }; #endif diff --git a/Laptop/BobbyR.cpp b/Laptop/BobbyR.cpp index 43d911bb..b81328dc 100644 --- a/Laptop/BobbyR.cpp +++ b/Laptop/BobbyR.cpp @@ -570,15 +570,10 @@ BOOLEAN InitBobbyRayNewInventory() // add all the NEW items he can ever sell into his possible inventory list, for now in order by item # for( i = 0; i < MAXITEMS; i++ ) { - if ( Item[i].usItemClass == 0 ) - break; //if Bobby Ray sells this, it can be sold, and it's allowed into this game (some depend on e.g. gun-nut option) // if( ( StoreInventory[ i ][ BOBBY_RAY_NEW ] != 0) && !( Item[ i ].fFlags & ITEM_NOT_BUYABLE ) && ItemIsLegal( i ) ) - if( !( Item[ i ].notbuyable ) ) - { - LaptopSaveInfo.BobbyRayInventory[ usBobbyrIndex ].usItemIndex = i; - usBobbyrIndex++; - } + LaptopSaveInfo.BobbyRayInventory[ usBobbyrIndex ].usItemIndex = i; + usBobbyrIndex++; } if ( usBobbyrIndex > 1 ) @@ -608,18 +603,13 @@ BOOLEAN InitBobbyRayUsedInventory() // add all the NEW items he can ever sell into his possible inventory list, for now in order by item # for( i = 0; i < MAXITEMS; i++ ) { - if ( Item[i].usItemClass == 0 ) - break; //if Bobby Ray sells this, it can be sold, and it's allowed into this game (some depend on e.g. gun-nut option) // if( ( StoreInventory[ i ][ BOBBY_RAY_USED ] != 0) && !( Item[ i ].fFlags & ITEM_NOT_BUYABLE ) && ItemIsLegal( i ) ) - if( !( Item[ i ].notbuyable ) ) + // in case his store inventory list is wrong, make sure this category of item can be sold used + if ( CanDealerItemBeSoldUsed( i ) ) { - // in case his store inventory list is wrong, make sure this category of item can be sold used - if ( CanDealerItemBeSoldUsed( i ) ) - { - LaptopSaveInfo.BobbyRayUsedInventory[ usBobbyrIndex ].usItemIndex = i; - usBobbyrIndex++; - } + LaptopSaveInfo.BobbyRayUsedInventory[ usBobbyrIndex ].usItemIndex = i; + usBobbyrIndex++; } }