Store the profile type in the profile structure and remove superfluous code

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8620 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2018-09-24 19:36:28 +00:00
parent 8ae2eacfcd
commit 494dbc6e69
41 changed files with 385 additions and 942 deletions
+4 -4
View File
@@ -4767,14 +4767,14 @@ void SoldierGiveItemFromAnimation( SOLDIERTYPE *pSoldier )
// Switch on target...
// Are we a player dude.. ( target? )
// if ( ubProfile < FIRST_RPC || RPC_RECRUITED( pTSoldier ) || ubProfile >= GASTON )
//new profiles by Jazz
if ( ( gProfilesAIM[ubProfile].ProfilId == ubProfile || gProfilesMERC[ubProfile].ProfilId == ubProfile || gProfilesIMP[ubProfile].ProfilId == ubProfile ) || RPC_RECRUITED( pTSoldier ) )
if ( gMercProfiles[ubProfile].Type == PROFILETYPE_AIM ||
gMercProfiles[ubProfile].Type == PROFILETYPE_MERC ||
gMercProfiles[ubProfile].Type == PROFILETYPE_IMP ||
RPC_RECRUITED( pTSoldier ) )
{
fToTargetPlayer = TRUE;
}
if ( fToTargetPlayer )
{
// begin giving