Merge branch 'master' into ExtraMercs

Tactical/Soldier Init List.cpp

@@ -1,6 +1,3 @@
-#ifdef PRECOMPILEDHEADERS
-#include "Tactical All.h"
-#else
 #include "builddefines.h"
 #include <stdio.h>
 #include <memory.h>
@@ -46,7 +43,6 @@
 #include "screenids.h"
 #include "SaveLoadScreen.h"
 #include "Rotting Corpses.h"
-#endif
 
 #include "connect.h"
 #include "Map Edgepoints.h"
@@ -1853,7 +1849,7 @@ void AddSoldierInitListMilitia( UINT8 ubNumGreen, UINT8 ubNumRegs, UINT8 ubNumEl
 				else
 					Assert(0);
 				curr->pBasicPlacement->bTeam = MILITIA_TEAM;
-				curr->pBasicPlacement->bOrders = STATIONARY;
+				curr->pBasicPlacement->bOrders = ONGUARD;
 				curr->pBasicPlacement->bAttitude = (INT8) Random( MAXATTITUDES );
 
 				// silversurfer: Replace body type. Militia tanks are not allowed.