Forbid time compression if hostile civilians or bloodcats are in the sector. Otherwise all travelling squads are delayed over and over again.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6324 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2013-08-26 21:57:19 +00:00
parent 6ad228e91e
commit df7cb392c5
11 changed files with 30 additions and 0 deletions
@@ -1416,6 +1416,14 @@ BOOLEAN AllowedToTimeCompress( void )
{
return FALSE;
}
// Flugente: no time compression if hostile civilians bloodcats are in the current sector.
// Otherwise time progresses, but squad arrivals will be delayed as long as they still exist
if ( HostileCiviliansPresent() || HostileBloodcatsPresent() )
{
return FALSE;
}
#ifdef JA2UB
//if the player hasnt been to the initial sector yet
if( !GetSectorFlagStatus( gGameExternalOptions.ubDefaultArrivalSectorX, gGameExternalOptions.ubDefaultArrivalSectorY, 0, SF_HAS_ENTERED_TACTICAL ) ) //7, 8
+4
View File
@@ -13550,6 +13550,10 @@ void TellPlayerWhyHeCantCompressTime( void )
{
DoMapMessageBox( MSG_BOX_BASIC_STYLE, gzLateLocalizedString[ 28 ], MAP_SCREEN, MSG_BOX_FLAG_OK, MapScreenDefaultOkBoxCallback );
}
else if ( HostileCiviliansPresent() || HostileBloodcatsPresent() )
{
DoMapMessageBox( MSG_BOX_BASIC_STYLE, gzLateLocalizedString[ 65 ], MAP_SCREEN, MSG_BOX_FLAG_OK, MapScreenDefaultOkBoxCallback );
}
}
+2
View File
@@ -6104,6 +6104,8 @@ STR16 gzLateLocalizedString[] =
L"%s多打了1发子弹!", //"%s fires %d more round than intended!",
L"你得先关闭物品信息界面!",
L"Cannot compress time - hostile civilians and/or bloodcats are in this sector.", // 65 // TODO.Translate
};
// HEADROCK HAM 3.5: Added sector name
+2
View File
@@ -6111,6 +6111,8 @@ STR16 gzLateLocalizedString[] =
L"%s fires one more round than intended!",
L"You need to close the item description box first!", // TODO.Translate
L"Cannot compress time - hostile civilians and/or bloodcats are in this sector.", // 65 // TODO.Translate
};
STR16 gzCWStrings[] =
+2
View File
@@ -6104,6 +6104,8 @@ STR16 gzLateLocalizedString[] =
L"%s fires one more round than intended!",
L"You need to close the item description box first!",
L"Cannot compress time - hostile civilians and/or bloodcats are in this sector.", // 65
};
// HEADROCK HAM 3.5: Added sector name
+2
View File
@@ -6102,6 +6102,8 @@ STR16 gzLateLocalizedString[] =
L"%s tire 1 fois de plus que prévu !",
L"You need to close the item description box first!", // TODO.Translate
L"Cannot compress time - hostile civilians and/or bloodcats are in this sector.", // 65 // TODO.Translate
};
STR16 gzCWStrings[] =
+2
View File
@@ -5933,6 +5933,8 @@ STR16 gzLateLocalizedString[] =
L"%s feuert einen Schuss mehr als beabsichtigt!",
L"Sie müssen zuerst das Gegenstandsbeschreibungsfenster schließen!",
L"Zeitraffer kann nicht betätigt werden - Feindliche Zivilisten/Bloodcats sind im Sektor.", // 65
};
STR16 gzCWStrings[] =
+2
View File
@@ -6097,6 +6097,8 @@ STR16 gzLateLocalizedString[] =
L"%s fires one more round than intended!",
L"You need to close the item description box first!", // TODO.Translate
L"Cannot compress time - hostile civilians and/or bloodcats are in this sector.", // 65 // TODO.Translate
};
STR16 gzCWStrings[] =
+2
View File
@@ -6112,6 +6112,8 @@ STR16 gzLateLocalizedString[] =
L"%s wystrzelił(a) 1 pocisk(ów) więcej niż to było zamierzone!",
L"You need to close the item description box first!", // TODO.Translate
L"Cannot compress time - hostile civilians and/or bloodcats are in this sector.", // 65 // TODO.Translate
};
STR16 gzCWStrings[] =
+2
View File
@@ -6103,6 +6103,8 @@ STR16 gzLateLocalizedString[] =
L"%s выпустил на одну пулю больше!",
L"Сперва закрой описание предмета!",
L"Cannot compress time - hostile civilians and/or bloodcats are in this sector.", // 65 // TODO.Translate
};
// HEADROCK HAM 3.5: Added sector name
+2
View File
@@ -6114,6 +6114,8 @@ STR16 gzLateLocalizedString[] =
L"%s fires one more round than intended!",
L"You need to close the item description box first!", // TODO.Translate
L"Cannot compress time - hostile civilians and/or bloodcats are in this sector.", // 65 // TODO.Translate
};
STR16 gzCWStrings[] =