Space Viking's many mercs changes plus numerous generic bug fixes

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

Tactical/Soldier Init List.cpp

@@ -17,6 +17,7 @@
 #include "debug.h"
 #include "Random.h"
 #include "items.h"
+#include "GameSettings.h"
 
 #include "cursors.h"
 
@@ -918,6 +919,8 @@ void AddSoldierInitListEnemyDefenceSoldiers( UINT8 ubTotalAdmin, UINT8 ubTotalTr
 
 	ubMaxNum = ubTotalAdmin + ubTotalTroops + ubTotalElite;
 
+	AssertLE (ubMaxNum, gGameExternalOptions.ubGameMaximumNumberOfEnemies);
+
 	//Sort the list in the following manner:
 	//-Priority placements first
 	//-Basic placements next