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

GameSettings.h

@@ -93,6 +93,12 @@ typedef struct
 
 }	GAME_SETTINGS;
 
+// CHRISL: New Enums to track inventory system
+enum
+{
+	INVENTORY_OLD = 0,
+	INVENTORY_NEW = 1
+};
 
 
 //Enums for the difficulty levels
@@ -131,10 +137,13 @@ typedef struct
 	BOOLEAN	fTurnTimeLimit;
 	BOOLEAN	fIronManMode;
 	UINT8	ubBobbyRay;
-	UINT8	ubFiller[7];
+	UINT8	ubInventorySystem;
+	UINT8	ubFiller[6];
 
 } GAME_OPTIONS;
 
+bool UsingNewInventorySystem();
+
 // Snap: Options read from an INI file in the default of custom Data directory
 typedef struct
 {
@@ -254,7 +263,7 @@ typedef struct
 
 	
 	//Sight range
-	UINT32  ubStraightSightRange;
+	UINT32	ubStraightSightRange;
 	UINT32 ubVisDistDecreasePerRainIntensity;
 	BOOLEAN gfAllowLimitedVision;
 
@@ -413,6 +422,9 @@ typedef struct
 	BOOLEAN fEnableSoldierTooltipBigSlot2;
 	BOOLEAN fEnableSoldierTooltipBigSlot3;
 	BOOLEAN fEnableSoldierTooltipBigSlot4;
+	BOOLEAN fEnableSoldierTooltipBigSlot5;
+	BOOLEAN fEnableSoldierTooltipBigSlot6;
+	BOOLEAN fEnableSoldierTooltipBigSlot7;
 	// ShadoWarrior: Tooltip changes (end)
 
 	//Kaiden MERC Deaths Externalized:
@@ -425,9 +437,17 @@ typedef struct
 	// Lesh: slow enemy items choice progress
 	BOOLEAN fSlowProgressForEnemyItemsChoice;
 
+	// CHRISL: option to allow Slay to remain as a hired PC
+	BOOLEAN fEnableSlayForever;
+
+	// CHRISL: New setting to determine the AP cost to reload 1 loose round of ammo
+	INT32 ubAPCostPerRound;
+
+	// CHRISL: New setting to determine AP multiplier when reloading with wrong sized clip
+	FLOAT ubWrongMagMult;
 } GAME_EXTERNAL_OPTIONS;
 
-//This structure will contain general Ja2 settings  NOT individual game settings.
+//This structure will contain general Ja2 settings	NOT individual game settings.
 extern GAME_SETTINGS		gGameSettings;
 
 //This structure will contain the Game options set at the beginning of the game.