mirror of
https://github.com/1dot13/source.git
synced 2026-07-22 13:40:22 +02:00
Merged New Inventory Project into main branch
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1871 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
lalien
+223
-280
@@ -3,7 +3,7 @@
|
||||
#else
|
||||
#include "Types.h"
|
||||
#include "ArmsDealerInvInit.h"
|
||||
#include "Item Types.h"
|
||||
//#include "Item Types.h"
|
||||
#include "Arms Dealer Init.h"
|
||||
#include "DEbug.h"
|
||||
#include "weapons.h"
|
||||
@@ -17,9 +17,15 @@
|
||||
#endif
|
||||
|
||||
|
||||
//forward declarations of common classes to eliminate includes
|
||||
class OBJECTTYPE;
|
||||
class SOLDIERTYPE;
|
||||
|
||||
|
||||
extern INT8 gbSelectedArmsDealerID;
|
||||
|
||||
|
||||
// CHRISL: Updated this to include IC_LBEGEAR class
|
||||
// This table controls the order items appear in inventory at BR's and dealers, and which kinds of items are sold used
|
||||
ITEM_SORT_ENTRY DealerItemSortInfo[ ] =
|
||||
{
|
||||
@@ -36,6 +42,7 @@ ITEM_SORT_ENTRY DealerItemSortInfo[ ] =
|
||||
{ IC_BLADE, NOGUNCLASS, FALSE },
|
||||
{ IC_THROWING_KNIFE, NOGUNCLASS, FALSE },
|
||||
{ IC_PUNCH, NOGUNCLASS, FALSE },
|
||||
{ IC_LBEGEAR, NOGUNCLASS, TRUE },
|
||||
{ IC_ARMOUR, NOGUNCLASS, TRUE },
|
||||
{ IC_FACE, NOGUNCLASS, TRUE },
|
||||
{ IC_MEDKIT, NOGUNCLASS, FALSE },
|
||||
@@ -62,7 +69,7 @@ ITEM_SORT_ENTRY DealerItemSortInfo[ ] =
|
||||
// Tony ( Weapons only )
|
||||
//
|
||||
|
||||
DEALER_POSSIBLE_INV gTonyInventory[MAXITEMS+1];// =
|
||||
DEALER_POSSIBLE_INV gTonyInventory[MAXITEMS+1];// =
|
||||
//{
|
||||
// //Rare guns/ammo that Tony will buy although he won't ever sell them
|
||||
// { ROCKET_RIFLE, 0 },
|
||||
@@ -72,43 +79,43 @@ DEALER_POSSIBLE_INV gTonyInventory[MAXITEMS+1];// =
|
||||
//
|
||||
//
|
||||
// //Weapons
|
||||
// { GLOCK_17, 1 }, /* Glock 17 */
|
||||
// { GLOCK_18, 1 }, /* Glock 18 */
|
||||
// { BERETTA_92F, 1 }, /* Beretta 92F */
|
||||
// { BERETTA_93R, 1 }, /* Beretta 93R */
|
||||
// { SW38, 1 }, /* .38 S&W Special */
|
||||
// { BARRACUDA, 1 }, /* .357 Barracuda */
|
||||
// { DESERTEAGLE, 1 }, /* .357 DesertEagle*/
|
||||
// { M1911, 1 }, /* .45 M1911 */
|
||||
// { MP5K, 1 }, /* H&K MP5K */
|
||||
// { GLOCK_17, 1 }, /* Glock 17 */
|
||||
// { GLOCK_18, 1 }, /* Glock 18 */
|
||||
// { BERETTA_92F, 1 }, /* Beretta 92F */
|
||||
// { BERETTA_93R, 1 }, /* Beretta 93R */
|
||||
// { SW38, 1 }, /* .38 S&W Special */
|
||||
// { BARRACUDA, 1 }, /* .357 Barracuda */
|
||||
// { DESERTEAGLE, 1 }, /* .357 DesertEagle*/
|
||||
// { M1911, 1 }, /* .45 M1911 */
|
||||
// { MP5K, 1 }, /* H&K MP5K */
|
||||
// { MAC10, 1 }, /* .45 MAC-10 */
|
||||
//
|
||||
// { THOMPSON, 1 }, /* Thompson M1A1 */
|
||||
// { COMMANDO, 1 }, /* Colt Commando */
|
||||
// { MP53, 1 }, /* H&K MP53 */
|
||||
// { AKSU74, 1 }, /* AKSU-74 */
|
||||
// { TYPE85, 1 }, /* Type-85 */
|
||||
// { SKS, 1 }, /* SKS */
|
||||
// { DRAGUNOV, 1 }, /* Dragunov */
|
||||
// { M24, 1 }, /* M24 */
|
||||
// { THOMPSON, 1 }, /* Thompson M1A1 */
|
||||
// { COMMANDO, 1 }, /* Colt Commando */
|
||||
// { MP53, 1 }, /* H&K MP53 */
|
||||
// { AKSU74, 1 }, /* AKSU-74 */
|
||||
// { TYPE85, 1 }, /* Type-85 */
|
||||
// { SKS, 1 }, /* SKS */
|
||||
// { DRAGUNOV, 1 }, /* Dragunov */
|
||||
// { M24, 1 }, /* M24 */
|
||||
// { AUG, 1 }, /* Steyr AUG */
|
||||
//
|
||||
// { G41, 1 }, /* H&K G41 */
|
||||
// { MINI14, 1 }, /* Ruger Mini-14 */
|
||||
// { C7, 1 }, /* C-7 */
|
||||
// { FAMAS, 1 }, /* FA-MAS */
|
||||
// { AK74, 1 }, /* AK-74 */
|
||||
// { AKM, 1 }, /* AKM */
|
||||
// { M14, 1 }, /* M-14 */
|
||||
// { G3A3, 1 }, /* H&K G3A3 */
|
||||
// { G41, 1 }, /* H&K G41 */
|
||||
// { MINI14, 1 }, /* Ruger Mini-14 */
|
||||
// { C7, 1 }, /* C-7 */
|
||||
// { FAMAS, 1 }, /* FA-MAS */
|
||||
// { AK74, 1 }, /* AK-74 */
|
||||
// { AKM, 1 }, /* AKM */
|
||||
// { M14, 1 }, /* M-14 */
|
||||
// { G3A3, 1 }, /* H&K G3A3 */
|
||||
// { FNFAL, 1 }, /* FN-FAL */
|
||||
//
|
||||
// { MINIMI, 1 },
|
||||
// { RPK74, 1 },
|
||||
// { HK21E, 1 },
|
||||
//
|
||||
// { M870, 1 }, /* Remington M870 */
|
||||
// { SPAS15, 1 }, /* SPAS-15 */
|
||||
// { M870, 1 }, /* Remington M870 */
|
||||
// { SPAS15, 1 }, /* SPAS-15 */
|
||||
//
|
||||
// { GLAUNCHER, 1 }, /* grenade launcher*/
|
||||
// { UNDER_GLAUNCHER, 1 }, /* underslung g.l. */
|
||||
@@ -147,10 +154,10 @@ DEALER_POSSIBLE_INV gTonyInventory[MAXITEMS+1];// =
|
||||
// //Ammo
|
||||
// { CLIP9_15, 8 },
|
||||
// { CLIP9_30, 6 },
|
||||
// { CLIP9_15_AP, 3 }, /* CLIP9_15_AP */
|
||||
// { CLIP9_30_AP, 3 }, /* CLIP9_30_AP */
|
||||
// { CLIP9_15_HP, 3 }, /* CLIP9_15_HP */
|
||||
// { CLIP9_30_HP, 3 }, /* CLIP9_30_HP */
|
||||
// { CLIP9_15_AP, 3 }, /* CLIP9_15_AP */
|
||||
// { CLIP9_30_AP, 3 }, /* CLIP9_30_AP */
|
||||
// { CLIP9_15_HP, 3 }, /* CLIP9_15_HP */
|
||||
// { CLIP9_30_HP, 3 }, /* CLIP9_30_HP */
|
||||
//
|
||||
// { CLIP38_6, 10}, /* CLIP38_6 */
|
||||
// { CLIP38_6_AP, 5 }, /* CLIP38_6_AP */
|
||||
@@ -159,23 +166,23 @@ DEALER_POSSIBLE_INV gTonyInventory[MAXITEMS+1];// =
|
||||
// { CLIP45_7, 6 }, /* CLIP45_7 */ // 70
|
||||
//
|
||||
// { CLIP45_30, 8 }, /* CLIP45_30 */
|
||||
// { CLIP45_7_AP, 3 }, /* CLIP45_7_AP */
|
||||
// { CLIP45_30_AP, 3 }, /* CLIP45_30_AP */
|
||||
// { CLIP45_7_HP, 3 }, /* CLIP45_7_HP */
|
||||
// { CLIP45_30_HP, 3 }, /* CLIP45_30_HP */
|
||||
// { CLIP45_7_AP, 3 }, /* CLIP45_7_AP */
|
||||
// { CLIP45_30_AP, 3 }, /* CLIP45_30_AP */
|
||||
// { CLIP45_7_HP, 3 }, /* CLIP45_7_HP */
|
||||
// { CLIP45_30_HP, 3 }, /* CLIP45_30_HP */
|
||||
//
|
||||
// { CLIP357_6, 6 }, /* CLIP357_6 */
|
||||
// { CLIP357_9, 5 }, /* CLIP357_9 */
|
||||
// { CLIP357_6_AP, 3 }, /* CLIP357_6_AP */
|
||||
// { CLIP357_9_AP, 3 }, /* CLIP357_9_AP */
|
||||
// { CLIP357_6_HP, 3 }, /* CLIP357_6_HP */ //80
|
||||
// { CLIP357_9_HP, 3 }, /* CLIP357_9_HP */
|
||||
// { CLIP357_6, 6 }, /* CLIP357_6 */
|
||||
// { CLIP357_9, 5 }, /* CLIP357_9 */
|
||||
// { CLIP357_6_AP, 3 }, /* CLIP357_6_AP */
|
||||
// { CLIP357_9_AP, 3 }, /* CLIP357_9_AP */
|
||||
// { CLIP357_6_HP, 3 }, /* CLIP357_6_HP */ //80
|
||||
// { CLIP357_9_HP, 3 }, /* CLIP357_9_HP */
|
||||
//
|
||||
// { CLIP545_30_AP, 6 }, /* CLIP545_30_AP */
|
||||
// { CLIP545_30_HP, 3 }, /* CLIP545_30_HP */
|
||||
// { CLIP545_30_AP, 6 }, /* CLIP545_30_AP */
|
||||
// { CLIP545_30_HP, 3 }, /* CLIP545_30_HP */
|
||||
//
|
||||
// { CLIP556_30_AP, 6 }, /* CLIP556_30_AP */
|
||||
// { CLIP556_30_HP, 3 }, /* CLIP556_30_HP */
|
||||
// { CLIP556_30_AP, 6 }, /* CLIP556_30_AP */
|
||||
// { CLIP556_30_HP, 3 }, /* CLIP556_30_HP */
|
||||
//
|
||||
// { CLIP762W_10_AP, 6 }, /* CLIP762W_10_AP */
|
||||
// { CLIP762W_30_AP, 5 }, /* CLIP762W_30_AP */
|
||||
@@ -184,18 +191,18 @@ DEALER_POSSIBLE_INV gTonyInventory[MAXITEMS+1];// =
|
||||
//
|
||||
// { CLIP762N_5_AP, 8 }, /* CLIP762N_5_AP */ //90
|
||||
// { CLIP762N_20_AP, 5 }, /* CLIP762N_20_AP */
|
||||
// { CLIP762N_5_HP, 3 }, /* CLIP762N_5_HP */
|
||||
// { CLIP762N_20_HP, 3 }, /* CLIP762N_20_HP */
|
||||
// { CLIP762N_5_HP, 3 }, /* CLIP762N_5_HP */
|
||||
// { CLIP762N_20_HP, 3 }, /* CLIP762N_20_HP */
|
||||
//
|
||||
// { CLIP47_50_SAP, 5 }, /* CLIP47_50_SAP */
|
||||
// { CLIP47_50_SAP, 5 }, /* CLIP47_50_SAP */
|
||||
//
|
||||
// { CLIP57_50_AP, 6 }, /* CLIP57_50_AP */
|
||||
// { CLIP57_50_HP, 3 }, /* CLIP57_50_HP */
|
||||
// { CLIP57_50_AP, 6 }, /* CLIP57_50_AP */
|
||||
// { CLIP57_50_HP, 3 }, /* CLIP57_50_HP */
|
||||
//
|
||||
// { CLIP12G_7, 9 }, /* CLIP12G_7 */
|
||||
// { CLIP12G_7, 9 }, /* CLIP12G_7 */
|
||||
// { CLIP12G_7_BUCKSHOT, 9 }, /* CLIP12G_7_BUCKSHOT */
|
||||
//
|
||||
// { CLIPCAWS_10_SAP, 5 }, /* CLIPCAWS_10_SAP */
|
||||
// { CLIPCAWS_10_SAP, 5 }, /* CLIPCAWS_10_SAP */
|
||||
// { CLIPCAWS_10_FLECH, 3 }, /* CLIPCAWS_10_FLECH */ //100
|
||||
//
|
||||
// { CLIPROCKET_AP, 3 },
|
||||
@@ -259,7 +266,7 @@ DEALER_POSSIBLE_INV gTonyInventory[MAXITEMS+1];// =
|
||||
//
|
||||
// Devin ( Explosives )
|
||||
//
|
||||
DEALER_POSSIBLE_INV gDevinInventory[MAXITEMS+1];// =
|
||||
DEALER_POSSIBLE_INV gDevinInventory[MAXITEMS+1];// =
|
||||
//{
|
||||
// { STUN_GRENADE, 3 },
|
||||
// { TEARGAS_GRENADE, 3 },
|
||||
@@ -314,7 +321,7 @@ DEALER_POSSIBLE_INV gDevinInventory[MAXITEMS+1];// =
|
||||
//
|
||||
// Franz (Expensive pawn shop )
|
||||
//
|
||||
DEALER_POSSIBLE_INV gFranzInventory[MAXITEMS+1];// =
|
||||
DEALER_POSSIBLE_INV gFranzInventory[MAXITEMS+1];// =
|
||||
//{
|
||||
// { NIGHTGOGGLES, 3 },
|
||||
//
|
||||
@@ -351,7 +358,7 @@ DEALER_POSSIBLE_INV gFranzInventory[MAXITEMS+1];// =
|
||||
//
|
||||
// Keith ( Cheap Pawn Shop )
|
||||
//
|
||||
DEALER_POSSIBLE_INV gKeithInventory[MAXITEMS+1];// =
|
||||
DEALER_POSSIBLE_INV gKeithInventory[MAXITEMS+1];// =
|
||||
//{
|
||||
// { FIRSTAIDKIT, 5 },
|
||||
//
|
||||
@@ -386,7 +393,7 @@ DEALER_POSSIBLE_INV gKeithInventory[MAXITEMS+1];// =
|
||||
//
|
||||
// Sam ( Hardware )
|
||||
//
|
||||
DEALER_POSSIBLE_INV gSamInventory[MAXITEMS+1];// =
|
||||
DEALER_POSSIBLE_INV gSamInventory[MAXITEMS+1];// =
|
||||
//{
|
||||
// { FIRSTAIDKIT, 3 },
|
||||
//
|
||||
@@ -427,7 +434,7 @@ DEALER_POSSIBLE_INV gSamInventory[MAXITEMS+1];// =
|
||||
//
|
||||
// Jake ( Junk )
|
||||
//
|
||||
DEALER_POSSIBLE_INV gJakeInventory[MAXITEMS+1];// =
|
||||
DEALER_POSSIBLE_INV gJakeInventory[MAXITEMS+1];// =
|
||||
//{
|
||||
// { FIRSTAIDKIT, 4 },
|
||||
// { MEDICKIT, 3 },
|
||||
@@ -462,13 +469,13 @@ DEALER_POSSIBLE_INV gJakeInventory[MAXITEMS+1];// =
|
||||
// { XRAY_BULB, 1 },
|
||||
//
|
||||
// // additional stuff possible in real game
|
||||
// { GLOCK_17, 1 }, /* Glock 17 */
|
||||
// { GLOCK_18, 1 }, /* Glock 18 */
|
||||
// { BERETTA_92F, 1 }, /* Beretta 92F */
|
||||
// { BERETTA_93R, 1 }, /* Beretta 93R */
|
||||
// { BARRACUDA, 1 }, /* .357 Barracuda */
|
||||
// { DESERTEAGLE, 1 }, /* .357 DesertEagle*/
|
||||
// { M1911, 1 }, /* .45 M1911 */
|
||||
// { GLOCK_17, 1 }, /* Glock 17 */
|
||||
// { GLOCK_18, 1 }, /* Glock 18 */
|
||||
// { BERETTA_92F, 1 }, /* Beretta 92F */
|
||||
// { BERETTA_93R, 1 }, /* Beretta 93R */
|
||||
// { BARRACUDA, 1 }, /* .357 Barracuda */
|
||||
// { DESERTEAGLE, 1 }, /* .357 DesertEagle*/
|
||||
// { M1911, 1 }, /* .45 M1911 */
|
||||
//
|
||||
// { DISCARDED_LAW, 1 },
|
||||
//
|
||||
@@ -495,7 +502,7 @@ DEALER_POSSIBLE_INV gJakeInventory[MAXITEMS+1];// =
|
||||
//
|
||||
// Howard ( Pharmaceuticals )
|
||||
//
|
||||
DEALER_POSSIBLE_INV gHowardInventory[MAXITEMS+1];// =
|
||||
DEALER_POSSIBLE_INV gHowardInventory[MAXITEMS+1];// =
|
||||
//{
|
||||
// { FIRSTAIDKIT, 10},
|
||||
// { MEDICKIT, 5 },
|
||||
@@ -516,7 +523,7 @@ DEALER_POSSIBLE_INV gHowardInventory[MAXITEMS+1];// =
|
||||
//
|
||||
// Gabby ( Creature parts and Blood )
|
||||
//
|
||||
DEALER_POSSIBLE_INV gGabbyInventory[MAXITEMS+1];// =
|
||||
DEALER_POSSIBLE_INV gGabbyInventory[MAXITEMS+1];// =
|
||||
//{
|
||||
// { JAR, 12 },
|
||||
// { JAR_ELIXIR, 3 },
|
||||
@@ -537,11 +544,11 @@ DEALER_POSSIBLE_INV gGabbyInventory[MAXITEMS+1];// =
|
||||
//
|
||||
// Frank ( Alcohol )
|
||||
//
|
||||
DEALER_POSSIBLE_INV gFrankInventory[MAXITEMS+1];// =
|
||||
DEALER_POSSIBLE_INV gFrankInventory[MAXITEMS+1];// =
|
||||
//{
|
||||
// { BEER, 12 },
|
||||
// { WINE, 6 },
|
||||
// { ALCOHOL, 9 },
|
||||
// { BEER, 12 },
|
||||
// { WINE, 6 },
|
||||
// { ALCOHOL, 9 },
|
||||
//
|
||||
// { LAST_DEALER_ITEM, NO_DEALER_ITEM }, //Last One
|
||||
//};
|
||||
@@ -550,11 +557,11 @@ DEALER_POSSIBLE_INV gFrankInventory[MAXITEMS+1];// =
|
||||
//
|
||||
// Elgin ( Alcohol )
|
||||
//
|
||||
DEALER_POSSIBLE_INV gElginInventory[MAXITEMS+1];// =
|
||||
DEALER_POSSIBLE_INV gElginInventory[MAXITEMS+1];// =
|
||||
//{
|
||||
// { BEER, 12 },
|
||||
// { WINE, 6 },
|
||||
// { ALCOHOL, 9 },
|
||||
// { BEER, 12 },
|
||||
// { WINE, 6 },
|
||||
// { ALCOHOL, 9 },
|
||||
//
|
||||
// { LAST_DEALER_ITEM, NO_DEALER_ITEM }, //Last One
|
||||
//};
|
||||
@@ -563,11 +570,11 @@ DEALER_POSSIBLE_INV gElginInventory[MAXITEMS+1];// =
|
||||
//
|
||||
// Manny ( Alcohol )
|
||||
//
|
||||
DEALER_POSSIBLE_INV gMannyInventory[MAXITEMS+1];// =
|
||||
DEALER_POSSIBLE_INV gMannyInventory[MAXITEMS+1];// =
|
||||
//{
|
||||
// { BEER, 12 },
|
||||
// { WINE, 6 },
|
||||
// { ALCOHOL, 9 },
|
||||
// { BEER, 12 },
|
||||
// { WINE, 6 },
|
||||
// { ALCOHOL, 9 },
|
||||
//
|
||||
// { LAST_DEALER_ITEM, NO_DEALER_ITEM }, //Last One
|
||||
//};
|
||||
@@ -576,11 +583,11 @@ DEALER_POSSIBLE_INV gMannyInventory[MAXITEMS+1];// =
|
||||
//
|
||||
// Herve Santos ( Alcohol )
|
||||
//
|
||||
DEALER_POSSIBLE_INV gHerveInventory[MAXITEMS+1];// =
|
||||
DEALER_POSSIBLE_INV gHerveInventory[MAXITEMS+1];// =
|
||||
//{
|
||||
// { BEER, 12 },
|
||||
// { WINE, 6 },
|
||||
// { ALCOHOL, 9 },
|
||||
// { BEER, 12 },
|
||||
// { WINE, 6 },
|
||||
// { ALCOHOL, 9 },
|
||||
//
|
||||
// { LAST_DEALER_ITEM, NO_DEALER_ITEM }, //Last One
|
||||
//};
|
||||
@@ -589,11 +596,11 @@ DEALER_POSSIBLE_INV gHerveInventory[MAXITEMS+1];// =
|
||||
//
|
||||
// Peter Santos ( Alcohol )
|
||||
//
|
||||
DEALER_POSSIBLE_INV gPeterInventory[MAXITEMS+1];// =
|
||||
DEALER_POSSIBLE_INV gPeterInventory[MAXITEMS+1];// =
|
||||
//{
|
||||
// { BEER, 12 },
|
||||
// { WINE, 6 },
|
||||
// { ALCOHOL, 9 },
|
||||
// { BEER, 12 },
|
||||
// { WINE, 6 },
|
||||
// { ALCOHOL, 9 },
|
||||
//
|
||||
// { LAST_DEALER_ITEM, NO_DEALER_ITEM }, //Last One
|
||||
//};
|
||||
@@ -602,11 +609,11 @@ DEALER_POSSIBLE_INV gPeterInventory[MAXITEMS+1];// =
|
||||
//
|
||||
// Alberto Santos ( Alcohol )
|
||||
//
|
||||
DEALER_POSSIBLE_INV gAlbertoInventory[MAXITEMS+1];// =
|
||||
DEALER_POSSIBLE_INV gAlbertoInventory[MAXITEMS+1];// =
|
||||
//{
|
||||
// { BEER, 12 },
|
||||
// { WINE, 6 },
|
||||
// { ALCOHOL, 9 },
|
||||
// { BEER, 12 },
|
||||
// { WINE, 6 },
|
||||
// { ALCOHOL, 9 },
|
||||
//
|
||||
// { LAST_DEALER_ITEM, NO_DEALER_ITEM }, //Last One
|
||||
//};
|
||||
@@ -615,11 +622,11 @@ DEALER_POSSIBLE_INV gAlbertoInventory[MAXITEMS+1];// =
|
||||
//
|
||||
// Carlo Santos ( Alcohol )
|
||||
//
|
||||
DEALER_POSSIBLE_INV gCarloInventory[MAXITEMS+1];// =
|
||||
DEALER_POSSIBLE_INV gCarloInventory[MAXITEMS+1];// =
|
||||
//{
|
||||
// { BEER, 12 },
|
||||
// { WINE, 6 },
|
||||
// { ALCOHOL, 9 },
|
||||
// { BEER, 12 },
|
||||
// { WINE, 6 },
|
||||
// { ALCOHOL, 9 },
|
||||
//
|
||||
// { LAST_DEALER_ITEM, NO_DEALER_ITEM }, //Last One
|
||||
//};
|
||||
@@ -629,7 +636,7 @@ DEALER_POSSIBLE_INV gCarloInventory[MAXITEMS+1];// =
|
||||
// Micky ( BUYS Animal / Creature parts )
|
||||
//
|
||||
|
||||
DEALER_POSSIBLE_INV gMickyInventory[MAXITEMS+1];// =
|
||||
DEALER_POSSIBLE_INV gMickyInventory[MAXITEMS+1];// =
|
||||
//{
|
||||
// // ONLY BUYS THIS STUFF, DOESN'T SELL IT
|
||||
// { BLOODCAT_CLAWS, 0 },
|
||||
@@ -647,7 +654,7 @@ DEALER_POSSIBLE_INV gMickyInventory[MAXITEMS+1];// =
|
||||
//
|
||||
// Arnie ( Weapons REPAIR )
|
||||
//
|
||||
DEALER_POSSIBLE_INV gArnieInventory[MAXITEMS+1];// =
|
||||
DEALER_POSSIBLE_INV gArnieInventory[MAXITEMS+1];// =
|
||||
//{
|
||||
// // NO INVENTORY
|
||||
//
|
||||
@@ -657,7 +664,7 @@ DEALER_POSSIBLE_INV gArnieInventory[MAXITEMS+1];// =
|
||||
//
|
||||
// Perko ( REPAIR)
|
||||
//
|
||||
DEALER_POSSIBLE_INV gPerkoInventory[MAXITEMS+1];// =
|
||||
DEALER_POSSIBLE_INV gPerkoInventory[MAXITEMS+1];// =
|
||||
//{
|
||||
// // NO INVENTORY
|
||||
//
|
||||
@@ -667,7 +674,7 @@ DEALER_POSSIBLE_INV gPerkoInventory[MAXITEMS+1];// =
|
||||
//
|
||||
// Fredo ( Electronics REPAIR)
|
||||
//
|
||||
DEALER_POSSIBLE_INV gFredoInventory[MAXITEMS+1];// =
|
||||
DEALER_POSSIBLE_INV gFredoInventory[MAXITEMS+1];// =
|
||||
//{
|
||||
// // NO INVENTORY
|
||||
//
|
||||
@@ -729,11 +736,11 @@ INT8 GetDealersMaxItemAmount( UINT8 ubDealerID, UINT16 usItemIndex )
|
||||
case ARMS_DEALER_JAKE:
|
||||
return( GetMaxItemAmount( gJakeInventory, usItemIndex ) );
|
||||
break;
|
||||
|
||||
|
||||
case ARMS_DEALER_FRANZ:
|
||||
return( GetMaxItemAmount( gFranzInventory, usItemIndex ) );
|
||||
break;
|
||||
|
||||
|
||||
case ARMS_DEALER_HOWARD:
|
||||
return( GetMaxItemAmount( gHowardInventory, usItemIndex ) );
|
||||
break;
|
||||
@@ -741,11 +748,11 @@ INT8 GetDealersMaxItemAmount( UINT8 ubDealerID, UINT16 usItemIndex )
|
||||
case ARMS_DEALER_SAM:
|
||||
return( GetMaxItemAmount( gSamInventory, usItemIndex ) );
|
||||
break;
|
||||
|
||||
|
||||
case ARMS_DEALER_FREDO:
|
||||
return( GetMaxItemAmount( gFredoInventory, usItemIndex ) );
|
||||
break;
|
||||
|
||||
|
||||
case ARMS_DEALER_GABBY:
|
||||
return( GetMaxItemAmount( gGabbyInventory, usItemIndex ) );
|
||||
break;
|
||||
@@ -836,11 +843,11 @@ DEALER_POSSIBLE_INV *GetPointerToDealersPossibleInventory( UINT8 ubArmsDealerID
|
||||
case ARMS_DEALER_JAKE:
|
||||
return( gJakeInventory );
|
||||
break;
|
||||
|
||||
|
||||
case ARMS_DEALER_FRANZ:
|
||||
return( gFranzInventory );
|
||||
break;
|
||||
|
||||
|
||||
case ARMS_DEALER_HOWARD:
|
||||
return( gHowardInventory );
|
||||
break;
|
||||
@@ -848,11 +855,11 @@ DEALER_POSSIBLE_INV *GetPointerToDealersPossibleInventory( UINT8 ubArmsDealerID
|
||||
case ARMS_DEALER_SAM:
|
||||
return( gSamInventory );
|
||||
break;
|
||||
|
||||
|
||||
case ARMS_DEALER_FREDO:
|
||||
return( gFredoInventory );
|
||||
break;
|
||||
|
||||
|
||||
case ARMS_DEALER_GABBY:
|
||||
return( gGabbyInventory );
|
||||
break;
|
||||
@@ -920,7 +927,7 @@ UINT8 GetCurrentSuitabilityForItem( INT8 bArmsDealer, UINT16 usItemIndex, BOOLEA
|
||||
// case JAR:
|
||||
// case JAR_ELIXIR:
|
||||
// case JAR_CREATURE_BLOOD:
|
||||
if ( Item[usItemIndex].medical || Item[usItemIndex].canteen || Item[usItemIndex].medicalkit || Item[usItemIndex].locksmithkit || Item[usItemIndex].toolkit || Item[usItemIndex].crowbar || Item[usItemIndex].jar )
|
||||
if ( Item[usItemIndex].medical || Item[usItemIndex].canteen || Item[usItemIndex].medicalkit || Item[usItemIndex].locksmithkit || Item[usItemIndex].toolkit || Item[usItemIndex].crowbar || Item[usItemIndex].jar )
|
||||
return(ITEM_SUITABILITY_ALWAYS);
|
||||
//}
|
||||
|
||||
@@ -944,10 +951,10 @@ UINT8 GetCurrentSuitabilityForItem( INT8 bArmsDealer, UINT16 usItemIndex, BOOLEA
|
||||
//Madd: Bobby Ray's will sell higher coolness stuff if it's used, and may also have a better selection at the start of the game, depending on selection
|
||||
if ( bArmsDealer == -1 && gGameOptions.ubBobbyRay > BR_GOOD )
|
||||
{
|
||||
ubMaxCoolness += gGameOptions.ubBobbyRay - 1;
|
||||
ubMaxCoolness += gGameOptions.ubBobbyRay - 1;
|
||||
if (fUsed )
|
||||
{
|
||||
ubMaxCoolness += 1;
|
||||
ubMaxCoolness += 1;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1128,7 +1135,7 @@ BOOLEAN ItemTransactionOccurs( INT8 bArmsDealer, UINT16 usItemIndex, BOOLEAN fDe
|
||||
}
|
||||
else
|
||||
{
|
||||
gArmsDealersInventory[ bArmsDealer ][ usItemIndex ].fPreviouslyEligible = TRUE;
|
||||
gArmsDealerStatus[ bArmsDealer ].fPreviouslyEligible[ usItemIndex ] = TRUE;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1219,72 +1226,17 @@ int BobbyRayItemQsortCompare(const void *pArg1, const void *pArg2)
|
||||
UINT8 ubItem1Quality;
|
||||
UINT8 ubItem2Quality;
|
||||
|
||||
usItem1Index = ( ( STORE_INVENTORY * ) pArg1 ) -> usItemIndex;
|
||||
usItem2Index = ( ( STORE_INVENTORY * ) pArg2 ) -> usItemIndex;
|
||||
usItem1Index = ( ( STORE_INVENTORY * ) pArg1 )->usItemIndex;
|
||||
usItem2Index = ( ( STORE_INVENTORY * ) pArg2 )->usItemIndex;
|
||||
|
||||
ubItem1Quality = ( ( STORE_INVENTORY * ) pArg1 ) -> ubItemQuality;
|
||||
ubItem2Quality = ( ( STORE_INVENTORY * ) pArg2 ) -> ubItemQuality;
|
||||
ubItem1Quality = ( ( STORE_INVENTORY * ) pArg1 )->ubItemQuality;
|
||||
ubItem2Quality = ( ( STORE_INVENTORY * ) pArg2 )->ubItemQuality;
|
||||
|
||||
return( CompareItemsForSorting( usItem1Index, usItem2Index, ubItem1Quality, ubItem2Quality ) );
|
||||
}
|
||||
|
||||
|
||||
|
||||
int ArmsDealerItemQsortCompare(const void *pArg1, const void *pArg2)
|
||||
{
|
||||
UINT16 usItem1Index;
|
||||
UINT16 usItem2Index;
|
||||
UINT8 ubItem1Quality;
|
||||
UINT8 ubItem2Quality;
|
||||
|
||||
usItem1Index = ( ( INVENTORY_IN_SLOT * ) pArg1 ) -> sItemIndex;
|
||||
usItem2Index = ( ( INVENTORY_IN_SLOT * ) pArg2 ) -> sItemIndex;
|
||||
|
||||
ubItem1Quality = ( ( INVENTORY_IN_SLOT * ) pArg1 ) -> ItemObject.ItemData.Generic.bStatus[ 0 ];
|
||||
ubItem2Quality = ( ( INVENTORY_IN_SLOT * ) pArg2 ) -> ItemObject.ItemData.Generic.bStatus[ 0 ];
|
||||
|
||||
return( CompareItemsForSorting( usItem1Index, usItem2Index, ubItem1Quality, ubItem2Quality ) );
|
||||
}
|
||||
|
||||
|
||||
|
||||
int RepairmanItemQsortCompare(const void *pArg1, const void *pArg2)
|
||||
{
|
||||
INVENTORY_IN_SLOT* pInvSlot1;
|
||||
INVENTORY_IN_SLOT* pInvSlot2;
|
||||
UINT32 uiRepairTime1;
|
||||
UINT32 uiRepairTime2;
|
||||
|
||||
|
||||
pInvSlot1 = ( INVENTORY_IN_SLOT * ) pArg1;
|
||||
pInvSlot2 = ( INVENTORY_IN_SLOT * ) pArg2;
|
||||
|
||||
Assert( pInvSlot1->sSpecialItemElement != -1);
|
||||
Assert( pInvSlot2->sSpecialItemElement != -1);
|
||||
|
||||
uiRepairTime1 = gArmsDealersInventory[ gbSelectedArmsDealerID ][ pInvSlot1->sItemIndex ].SpecialItem[ pInvSlot1->sSpecialItemElement ].uiRepairDoneTime;
|
||||
uiRepairTime2 = gArmsDealersInventory[ gbSelectedArmsDealerID ][ pInvSlot2->sItemIndex ].SpecialItem[ pInvSlot2->sSpecialItemElement ].uiRepairDoneTime;
|
||||
|
||||
|
||||
// lower reapir time first
|
||||
if ( uiRepairTime1 < uiRepairTime2 )
|
||||
{
|
||||
return( -1 );
|
||||
}
|
||||
else
|
||||
if ( uiRepairTime1 > uiRepairTime2 )
|
||||
{
|
||||
return( 1 );
|
||||
}
|
||||
else
|
||||
{
|
||||
return( 0 );
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
int CompareItemsForSorting( UINT16 usItem1Index, UINT16 usItem2Index, UINT8 ubItem1Quality, UINT8 ubItem2Quality )
|
||||
int CompareItemsForSorting( UINT16 usItem1Index, UINT16 usItem2Index, UINT16 ubItem1Quality, UINT16 ubItem2Quality )
|
||||
{
|
||||
UINT8 ubItem1Category;
|
||||
UINT8 ubItem2Category;
|
||||
@@ -1297,124 +1249,115 @@ int CompareItemsForSorting( UINT16 usItem1Index, UINT16 usItem2Index, UINT8 ubIt
|
||||
ubItem2Category = GetDealerItemCategoryNumber( usItem2Index );
|
||||
|
||||
// lower category first
|
||||
if ( ubItem1Category < ubItem2Category )
|
||||
{
|
||||
return( -1 );
|
||||
}
|
||||
else
|
||||
if ( ubItem1Category > ubItem2Category )
|
||||
{
|
||||
return( 1 );
|
||||
}
|
||||
else
|
||||
{
|
||||
// the same category
|
||||
//if ( Item[ usItem1Index ].usItemClass == IC_AMMO && Item[ usItem2Index ].usItemClass == IC_AMMO )
|
||||
//{
|
||||
//UINT8 ubItem1Calibre;
|
||||
//UINT8 ubItem2Calibre;
|
||||
//UINT8 ubItem1MagSize;
|
||||
//UINT8 ubItem2MagSize;
|
||||
if ( ubItem1Category < ubItem2Category )
|
||||
{
|
||||
return( -1 );
|
||||
}
|
||||
else if ( ubItem1Category > ubItem2Category )
|
||||
{
|
||||
return( 1 );
|
||||
}
|
||||
|
||||
// AMMO is sorted by caliber first
|
||||
//ubItem1Calibre = Magazine[ Item[ usItem1Index ].ubClassIndex ].ubCalibre;
|
||||
//ubItem2Calibre = Magazine[ Item[ usItem2Index ].ubClassIndex ].ubCalibre;
|
||||
//if ( ubItem1Calibre > ubItem2Calibre )
|
||||
//{
|
||||
// return( -1 );
|
||||
//}
|
||||
//else
|
||||
//if ( ubItem1Calibre < ubItem2Calibre )
|
||||
//{
|
||||
// return( 1 );
|
||||
//}
|
||||
//// the same caliber - compare size of magazine, then fall out of if statement
|
||||
//ubItem1MagSize = Magazine[ Item[ usItem1Index ].ubClassIndex ].ubMagSize;
|
||||
//ubItem2MagSize = Magazine[ Item[ usItem2Index ].ubClassIndex ].ubMagSize;
|
||||
//if ( ubItem1MagSize > ubItem2MagSize )
|
||||
//{
|
||||
// return( -1 );
|
||||
//}
|
||||
//else
|
||||
//if ( ubItem1MagSize < ubItem2MagSize )
|
||||
//{
|
||||
// return( 1 );
|
||||
//}
|
||||
//}
|
||||
//else
|
||||
//{
|
||||
// items other than ammo are compared on coolness first
|
||||
//ubItem1Coolness = Item[ usItem1Index ].ubCoolness;
|
||||
//ubItem2Coolness = Item[ usItem2Index ].ubCoolness;
|
||||
// the same category
|
||||
//if ( Item[ usItem1Index ].usItemClass == IC_AMMO && Item[ usItem2Index ].usItemClass == IC_AMMO )
|
||||
//{
|
||||
//UINT8 ubItem1Calibre;
|
||||
//UINT8 ubItem2Calibre;
|
||||
//UINT8 ubItem1MagSize;
|
||||
//UINT8 ubItem2MagSize;
|
||||
|
||||
//// higher coolness first
|
||||
//if ( ubItem1Coolness > ubItem2Coolness )
|
||||
//{
|
||||
// return( -1 );
|
||||
//}
|
||||
//else
|
||||
//if ( ubItem1Coolness < ubItem2Coolness )
|
||||
//{
|
||||
// return( 1 );
|
||||
//}
|
||||
//}
|
||||
|
||||
// the same coolness/caliber - compare base prices then
|
||||
//usItem1Price = Item[ usItem1Index ].usPrice;
|
||||
//usItem2Price = Item[ usItem2Index ].usPrice;
|
||||
|
||||
//// higher price first
|
||||
//if ( usItem1Price > usItem2Price )
|
||||
// AMMO is sorted by caliber first
|
||||
//ubItem1Calibre = Magazine[ Item[ usItem1Index ].ubClassIndex ].ubCalibre;
|
||||
//ubItem2Calibre = Magazine[ Item[ usItem2Index ].ubClassIndex ].ubCalibre;
|
||||
//if ( ubItem1Calibre > ubItem2Calibre )
|
||||
//{
|
||||
// return( -1 );
|
||||
//}
|
||||
//else
|
||||
//if ( usItem1Price < usItem2Price )
|
||||
//if ( ubItem1Calibre < ubItem2Calibre )
|
||||
//{
|
||||
// return( 1 );
|
||||
//}
|
||||
//else
|
||||
//// the same caliber - compare size of magazine, then fall out of if statement
|
||||
//ubItem1MagSize = Magazine[ Item[ usItem1Index ].ubClassIndex ].ubMagSize;
|
||||
//ubItem2MagSize = Magazine[ Item[ usItem2Index ].ubClassIndex ].ubMagSize;
|
||||
//if ( ubItem1MagSize > ubItem2MagSize )
|
||||
//{
|
||||
// the same price - compare item #s, then
|
||||
|
||||
//// lower index first
|
||||
//if ( usItem1Index < usItem2Index )
|
||||
//{
|
||||
// return( -1 );
|
||||
//}
|
||||
//else
|
||||
//if ( usItem1Index > usItem2Index )
|
||||
//{
|
||||
// return( 1 );
|
||||
//}
|
||||
|
||||
//Madd: sort by name (for now at least):
|
||||
if (_wcsicmp(Item[usItem1Index].szBRName,Item[usItem2Index].szBRName) < 0 )
|
||||
return -1;
|
||||
else if (_wcsicmp(Item[usItem1Index].szBRName,Item[usItem2Index].szBRName) > 0 )
|
||||
return 1;
|
||||
else
|
||||
{
|
||||
// same item type = compare item quality, then
|
||||
|
||||
// higher quality first
|
||||
if ( ubItem1Quality > ubItem2Quality )
|
||||
{
|
||||
return( -1 );
|
||||
}
|
||||
else
|
||||
if ( ubItem1Quality < ubItem2Quality )
|
||||
{
|
||||
return( 1 );
|
||||
}
|
||||
else
|
||||
{
|
||||
// identical items!
|
||||
return( 0 );
|
||||
}
|
||||
}
|
||||
// return( -1 );
|
||||
//}
|
||||
}
|
||||
//else
|
||||
//if ( ubItem1MagSize < ubItem2MagSize )
|
||||
//{
|
||||
// return( 1 );
|
||||
//}
|
||||
//}
|
||||
//else
|
||||
//{
|
||||
// items other than ammo are compared on coolness first
|
||||
//ubItem1Coolness = Item[ usItem1Index ].ubCoolness;
|
||||
//ubItem2Coolness = Item[ usItem2Index ].ubCoolness;
|
||||
|
||||
//// higher coolness first
|
||||
//if ( ubItem1Coolness > ubItem2Coolness )
|
||||
//{
|
||||
// return( -1 );
|
||||
//}
|
||||
//else
|
||||
//if ( ubItem1Coolness < ubItem2Coolness )
|
||||
//{
|
||||
// return( 1 );
|
||||
//}
|
||||
//}
|
||||
|
||||
// the same coolness/caliber - compare base prices then
|
||||
//usItem1Price = Item[ usItem1Index ].usPrice;
|
||||
//usItem2Price = Item[ usItem2Index ].usPrice;
|
||||
|
||||
//// higher price first
|
||||
//if ( usItem1Price > usItem2Price )
|
||||
//{
|
||||
// return( -1 );
|
||||
//}
|
||||
//else
|
||||
//if ( usItem1Price < usItem2Price )
|
||||
//{
|
||||
// return( 1 );
|
||||
//}
|
||||
//else
|
||||
//{
|
||||
// the same price - compare item #s, then
|
||||
|
||||
//// lower index first
|
||||
//if ( usItem1Index < usItem2Index )
|
||||
//{
|
||||
// return( -1 );
|
||||
//}
|
||||
//else
|
||||
//if ( usItem1Index > usItem2Index )
|
||||
//{
|
||||
// return( 1 );
|
||||
//}
|
||||
|
||||
//Madd: sort by name (for now at least):
|
||||
if (_wcsicmp(Item[usItem1Index].szBRName,Item[usItem2Index].szBRName) < 0 )
|
||||
return -1;
|
||||
else if (_wcsicmp(Item[usItem1Index].szBRName,Item[usItem2Index].szBRName) > 0 )
|
||||
return 1;
|
||||
|
||||
|
||||
// same item type = compare item quality, then
|
||||
// higher quality first
|
||||
if ( ubItem1Quality > ubItem2Quality )
|
||||
{
|
||||
return( -1 );
|
||||
}
|
||||
else if ( ubItem1Quality < ubItem2Quality )
|
||||
{
|
||||
return( 1 );
|
||||
}
|
||||
//}
|
||||
// identical items!
|
||||
return( 0 );
|
||||
}
|
||||
|
||||
|
||||
@@ -1428,7 +1371,7 @@ UINT8 GetDealerItemCategoryNumber( UINT16 usItemIndex )
|
||||
|
||||
uiItemClass = Item[ usItemIndex ].usItemClass;
|
||||
|
||||
if ( usItemIndex < MAXITEMS && IsWeapon(usItemIndex) )
|
||||
if ( usItemIndex < MAXITEMS && IsWeapon(usItemIndex) )
|
||||
{
|
||||
ubWeaponClass = 0;// Madd: commented out so we can sort guns by name instead ... Weapon[ usItemIndex ].ubWeaponClass;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user