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
2008-03-08 15:15:25 +00:00
parent e16d166277
commit 43ca24dda8
649 changed files with 93359 additions and 82507 deletions
+2
View File
@@ -11,6 +11,8 @@ extern INT16 gsTerroristSector[][5][2];
extern BOOLEAN gfPotentialTeamChangeDuringDeath;
extern MERCPROFILESTRUCT gMercProfiles[ NUM_PROFILES ];
extern MERCPROFILEGEAR gMercProfileGear[ NUM_PROFILES ];
#define AIM_AND_MERC_MERCS 51 // A.I.M. is 0-39, M.E.R.C.s are 40-50