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 Create.h

@@ -18,6 +18,7 @@ class SOLDIERTYPE;
 
 #define		SOLDIER_CREATE_AUTO_TEAM			-1
 
+// WDS - make number of mercenaries, etc. be configurable
 //Kris: 
 //This value is the total maximum number of slots in a map.	
 //Players		20
@@ -26,7 +27,7 @@ class SOLDIERTYPE;
 //Rebels		32
 //Civilians 32
 //Total			148
-#define MAX_INDIVIDUALS											148
+#define MAX_INDIVIDUALS											TOTAL_SOLDIERS
 
 //Kris:	SERIALIZING INFORMATION
 //All maps must have: