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 -5
View File
@@ -2595,12 +2595,11 @@ void AddProfilesUsingProfileInsertionData()
//for( i = FIRST_RPC; i < ( PROF_HUMMER ); i++ )
//new profiles by Jazz
for( i = 0; i < NUM_PROFILES; i++ )
for( i = 0; i < NUM_PROFILES; ++i )
{
if ( gProfilesRPC[i].ProfilId == i || gProfilesNPC[i].ProfilId == i )
{
if ( gMercProfiles[i].Type == PROFILETYPE_RPC ||
gMercProfiles[i].Type == PROFILETYPE_NPC )
{
//Perform various checks to make sure the soldier is actually in the same sector, alive, and so on.
//More importantly, the flag to use profile insertion data must be set.
if( gMercProfiles[ i ].sSectorX != gWorldSectorX ||