Merged Multi Player Project into main branch

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

Strategic/MilitiaSquads.cpp

@@ -28,6 +28,7 @@
 	#include "Tactical Save.h"
 #endif
 
+#include "connect.h"
 #include "MilitiaSquads.h"
 #include "Reinforcement.h"
 
@@ -765,10 +766,18 @@ void DoMilitiaHelpFromAdjacentSectors( INT16 sMapX, INT16 sMapY )
 		}
 	}
 
-	// If militia have been moved here, no reason to reset--just add them.	If militia have not moved, then no strategic
-	// changes were made.	Either case, this flag should be false.
-	gfStrategicMilitiaChangesMade = FALSE;
+	if (is_networked)
+	{
+		if (gfStrategicMilitiaChangesMade)
+		{
+			RemoveMilitiaFromTactical();
+			if(is_server && MILITIA_ENABLED)
+				PrepareMilitiaForTactical(FALSE);
+		}
 	}
+	
+	gfStrategicMilitiaChangesMade = FALSE;
+}
 
 void MSCallBack( UINT8 ubResult )
 {