Little Alien

- Moved new game settings from ja2.ini to Ja2_Options.ini
- Moved all settings from NewGameSettings.cpp to GameSettings.cpp
- New feature:  Militia movement on strategic map v1.3
- New feature: Automatic reload 
  Press Shift+R in tactical to reload all weapons of your team with magazines from sector inventory



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

Tactical/TeamTurns.cpp

@@ -43,6 +43,36 @@
 	#endif
 #endif
 
+#include "Reinforcement.h"
+
+
+//extern UINT8 gubSpeedUpAnimationFactor;
+void SetSoldierAniSpeed( SOLDIERTYPE *pSoldier );
+
+void RecalculateSoldiersAniSpeed()
+{
+	UINT32 uiLoop;
+	SOLDIERTYPE *pSoldier;
+
+//	if( gubSpeedUpAnimationFactor == 1 )return;
+
+	for (uiLoop = 0; uiLoop < guiNumMercSlots; uiLoop++)
+	{
+		pSoldier = MercSlots[ uiLoop ];
+
+		// if this merc is inactive, at base, on assignment, dead, unconscious
+		if (!pSoldier)
+		{
+			continue;          // next merc
+		}
+
+		SetSoldierAniSpeed( pSoldier );
+	}
+
+}
+
+
+
 extern void DecayPublicOpplist(INT8 bTeam);
 extern void VerifyAndDecayOpplist(SOLDIERTYPE *pSoldier);
 void EndInterrupt( BOOLEAN fMarkInterruptOccurred );
@@ -257,6 +287,8 @@ void EndTurn( UINT8 ubNextTeam )
 	{
 		AddPossiblePendingEnemiesToBattle();
 
+		AddPossiblePendingMilitiaToBattle();
+
 //		InitEnemyUIBar( );
 
 		FreezeInterfaceForEnemyTurn();
@@ -430,6 +462,8 @@ void BeginTeamTurn( UINT8 ubTeam )
 
 		}
 
+		RecalculateSoldiersAniSpeed();
+
 		if (ubTeam == gbPlayerNum )
 		{
 			// ATE: Check if we are still in a valid battle...