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
This commit is contained in:
Flugente
2014-02-19 21:03:54 +00:00
parent cee17f5651
commit 4a3ac749e9
11 changed files with 12 additions and 0 deletions
+2
View File
@@ -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;
+1
View File
@@ -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
};
+1
View File
@@ -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[] =
+1
View File
@@ -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[] =
+1
View File
@@ -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[] =
+1
View File
@@ -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[] =
+1
View File
@@ -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[] =
+1
View File
@@ -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[] =
+1
View File
@@ -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[] =
+1
View File
@@ -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[] =
+1
View File
@@ -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[] =