************************************************************

* Merged Source Code from Development Trunk: Revision 4063 *
************************************************************
- Source Code is merged from: https://81.169.133.124/source/ja2/branches/Wanne/JA2%201.13%20MP
- This will be the Source for the Beta 2011 Test

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4064 3b4a5df2-a311-0410-b5c6-a8a6f20db521

Tactical/Soldier Init List.cpp

@@ -53,6 +53,7 @@
 #include "Map Edgepoints.h"
 #include "Queen Command.h"
 
+#include "Map Edgepoints.h"
 BOOLEAN gfOriginalList = TRUE;
 
 SOLDIERINITNODE *gSoldierInitHead = NULL;
@@ -952,6 +953,7 @@ void AddSoldierInitListEnemyDefenceSoldiers( UINT8 ubTotalAdmin, UINT8 ubTotalTr
 	DebugMsg(TOPIC_JA2,DBG_LEVEL_3,String("AddSoldierInitListEnemyDefenceSoldiers"));
 
 	ResetMortarsOnTeamCount();
+	ResetNumSquadleadersInArmyGroup(); // added by SANDRO
 
 	//Specs call for only one profiled enemy can be in a sector at a time due to flavor reasons.
 	gfProfiledEnemyAdded = FALSE;
@@ -2142,8 +2144,14 @@ void AddProfilesUsingProfileInsertionData()
 	SOLDIERTYPE *pSoldier;
 	SOLDIERINITNODE * curr;
 
-	for( i = FIRST_RPC; i < ( PROF_HUMMER ); i++ )
+	//for( i = FIRST_RPC; i < ( PROF_HUMMER ); i++ )
+	//new profiles by Jazz
+	for( i = 0; i < NUM_PROFILES; i++ )
 	{
+	
+	if ( gProfilesRPC[i].ProfilId == i || gProfilesNPC[i].ProfilId == i ) 
+	{
+	
 		//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 ||
@@ -2213,6 +2221,8 @@ void AddProfilesUsingProfileInsertionData()
 				}
 			}
 		}
+
+	}
 	}
 }