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
+2 -3
View File
@@ -8731,9 +8731,8 @@ INT16 GetTownTrainPtsForCharacter( SOLDIERTYPE *pTrainer, UINT16 *pusMaxPts )
}
// RPCs get a small training bonus for being more familiar with the locals and their customs/needs than outsiders
//new profiles by Jazz
//if( pTrainer->ubProfile >= FIRST_RPC )
if ( gProfilesRPC[pTrainer->ubProfile].ProfilId == pTrainer->ubProfile || gProfilesNPC[pTrainer->ubProfile].ProfilId == pTrainer->ubProfile )
if ( gMercProfiles[pTrainer->ubProfile].Type == PROFILETYPE_RPC ||
gMercProfiles[pTrainer->ubProfile].Type == PROFILETYPE_NPC )
{
sTrainingBonus += gGameExternalOptions.ubRpcBonusToTrainMilitia;
}