From 4a3ac749e96d9c454f39683a2cd6c05d07012c66 Mon Sep 17 00:00:00 2001
From: Flugente <Flugente@3b4a5df2-a311-0410-b5c6-a8a6f20db521>
Date: Wed, 19 Feb 2014 21:03:54 +0000
Subject: [PATCH] Print out warning if militia moe is aborted due to no merc on
 COMMAND assignment

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6944 3b4a5df2-a311-0410-b5c6-a8a6f20db521
---
 Strategic/MilitiaSquads.cpp | 2 ++
 Utils/Text.h                | 1 +
 Utils/_ChineseText.cpp      | 1 +
 Utils/_DutchText.cpp        | 1 +
 Utils/_EnglishText.cpp      | 1 +
 Utils/_FrenchText.cpp       | 1 +
 Utils/_GermanText.cpp       | 1 +
 Utils/_ItalianText.cpp      | 1 +
 Utils/_PolishText.cpp       | 1 +
 Utils/_RussianText.cpp      | 1 +
 Utils/_TaiwaneseText.cpp    | 1 +
 11 files changed, 12 insertions(+)

diff --git a/Strategic/MilitiaSquads.cpp b/Strategic/MilitiaSquads.cpp
index 651755509..796812dc0 100644
--- a/Strategic/MilitiaSquads.cpp
+++ b/Strategic/MilitiaSquads.cpp
@@ -1446,6 +1446,8 @@ void MilitiaMovementOrder(UINT8 sector)
 	// to stop the player from just setting someone in HQ to give orders and then reassigning them, we simply demand that there'll also be someone when the militia peform the travelling
 	if ( !MercStaffsMilitaryHQ() )
 	{
+		ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, gpStrategicString[STR_MILITIAMOVEMENT_NO_STAFF_ABORT] );
+
 		// remove all movement flags
 		StrategicMap[ sX + ( sY * MAP_WORLD_X ) ].usFlags &= ~MILITIA_MOVE_ALLDIRS;
 		return;
diff --git a/Utils/Text.h b/Utils/Text.h
index b5da38412..07854e581 100644
--- a/Utils/Text.h
+++ b/Utils/Text.h
@@ -1810,6 +1810,7 @@ enum
 
 	// Flugente: militia movement forbidden due to limited roaming
 	STR_MILITIAMOVEMENT_NO_LIMITEDROAMING,
+	STR_MILITIAMOVEMENT_NO_STAFF_ABORT,
 
 	TEXT_NUM_STRATEGIC_TEXT
 };
diff --git a/Utils/_ChineseText.cpp b/Utils/_ChineseText.cpp
index a40a6997e..0e2dd97db 100644
--- a/Utils/_ChineseText.cpp
+++ b/Utils/_ChineseText.cpp
@@ -2795,6 +2795,7 @@ STR16 gpStrategicString[] =
 
 	// Flugente: militia movement forbidden due to limited roaming	// TODO.Translate
 	L"Militia cannot move here (RESTRICT_ROAMING = TRUE).",
+	L"War room isn't staffed - militia move aborted!",
 };
 
 STR16 gpGameClockString[] = 
diff --git a/Utils/_DutchText.cpp b/Utils/_DutchText.cpp
index a65c6cb9d..3f9d01733 100644
--- a/Utils/_DutchText.cpp
+++ b/Utils/_DutchText.cpp
@@ -2791,6 +2791,7 @@ STR16 gpStrategicString[] =
 
 	// Flugente: militia movement forbidden due to limited roaming	// TODO.Translate
 	L"Militia cannot move here (RESTRICT_ROAMING = TRUE).",
+	L"War room isn't staffed - militia move aborted!",
 };
 
 STR16 gpGameClockString[] = 
diff --git a/Utils/_EnglishText.cpp b/Utils/_EnglishText.cpp
index f65abc226..712a3718f 100644
--- a/Utils/_EnglishText.cpp
+++ b/Utils/_EnglishText.cpp
@@ -2794,6 +2794,7 @@ STR16 gpStrategicString[] =
 
 	// Flugente: militia movement forbidden due to limited roaming
 	L"Militia cannot move here (RESTRICT_ROAMING = TRUE).",
+	L"War room isn't staffed - militia move aborted!",
 };
 
 STR16 gpGameClockString[] = 
diff --git a/Utils/_FrenchText.cpp b/Utils/_FrenchText.cpp
index c431c351d..6cae4e0da 100644
--- a/Utils/_FrenchText.cpp
+++ b/Utils/_FrenchText.cpp
@@ -2800,6 +2800,7 @@ STR16 gpStrategicString[] =
 
 	// Flugente: militia movement forbidden due to limited roaming	// TODO.Translate
 	L"Militia cannot move here (RESTRICT_ROAMING = TRUE).",
+	L"War room isn't staffed - militia move aborted!",
 };
 
 STR16 gpGameClockString[] = 
diff --git a/Utils/_GermanText.cpp b/Utils/_GermanText.cpp
index dc86d1faa..17a3e28d4 100644
--- a/Utils/_GermanText.cpp
+++ b/Utils/_GermanText.cpp
@@ -2800,6 +2800,7 @@ STR16 gpStrategicString[] =
 
 	// Flugente: militia movement forbidden due to limited roaming	// TODO.Translate
 	L"Militia cannot move here (RESTRICT_ROAMING = TRUE).",
+	L"War room isn't staffed - militia move aborted!",
 };
 
 STR16 gpGameClockString[] = 
diff --git a/Utils/_ItalianText.cpp b/Utils/_ItalianText.cpp
index 2be911cb2..c49bd1665 100644
--- a/Utils/_ItalianText.cpp
+++ b/Utils/_ItalianText.cpp
@@ -2787,6 +2787,7 @@ STR16 gpStrategicString[] =
 
 	// Flugente: militia movement forbidden due to limited roaming	// TODO.Translate
 	L"Militia cannot move here (RESTRICT_ROAMING = TRUE).",
+	L"War room isn't staffed - militia move aborted!",
 };
 
 STR16 gpGameClockString[] = 
diff --git a/Utils/_PolishText.cpp b/Utils/_PolishText.cpp
index 328fa0973..8e3d379bd 100644
--- a/Utils/_PolishText.cpp
+++ b/Utils/_PolishText.cpp
@@ -2801,6 +2801,7 @@ STR16 gpStrategicString[] =
 
 	// Flugente: militia movement forbidden due to limited roaming	// TODO.Translate
 	L"Militia cannot move here (RESTRICT_ROAMING = TRUE).",
+	L"War room isn't staffed - militia move aborted!",
 };
 
 STR16 gpGameClockString[] = 
diff --git a/Utils/_RussianText.cpp b/Utils/_RussianText.cpp
index b98b70807..3f17cedab 100644
--- a/Utils/_RussianText.cpp
+++ b/Utils/_RussianText.cpp
@@ -2794,6 +2794,7 @@ STR16 gpStrategicString[] =
 
 	// Flugente: militia movement forbidden due to limited roaming	// TODO.Translate
 	L"Militia cannot move here (RESTRICT_ROAMING = TRUE).",
+	L"War room isn't staffed - militia move aborted!",
 };
 
 STR16 gpGameClockString[] = 
diff --git a/Utils/_TaiwaneseText.cpp b/Utils/_TaiwaneseText.cpp
index eeaea81c5..d84af6447 100644
--- a/Utils/_TaiwaneseText.cpp
+++ b/Utils/_TaiwaneseText.cpp
@@ -2796,6 +2796,7 @@ STR16 gpStrategicString[] =
 
 	// Flugente: militia movement forbidden due to limited roaming	// TODO.Translate
 	L"Militia cannot move here (RESTRICT_ROAMING = TRUE).",
+	L"War room isn't staffed - militia move aborted!",
 };
 
 STR16 gpGameClockString[] =