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

SaveLoadGame.h

@@ -1,9 +1,13 @@
 #ifndef _SAVE_LOAD_GAME_H_
 #define _SAVE_LOAD_GAME_H_
 
-#include "Soldier Control.h"
 #include "GameSettings.h"
 
+//forward declarations of common classes to eliminate includes
+class OBJECTTYPE;
+class SOLDIERTYPE;
+
+
 #define		BYTESINMEGABYTE						1048576 //1024*1024
 #define		REQUIRED_FREE_SPACE				(20 * BYTESINMEGABYTE)
 
@@ -50,13 +54,15 @@ typedef struct
 
 	UINT32	uiRandom;
 
-	UINT8		ubFiller[110];
+	UINT8	ubInventorySystem;
+
+	UINT8		ubFiller[109];
 
 } SAVED_GAME_HEADER;
 
 
 extern	UINT32		guiScreenToGotoAfterLoadingSavedGame;
-extern UINT32 guiSaveGameVersion;
+extern UINT32 guiCurrentSaveGameVersion;
 
 void			CreateSavedGameFileNameFromNumber( UINT8 ubSaveGameID, STR pzNewFileName );