Fixes (by DepressivesBrot):

- fixed some text errors
- enabled 'mark remaining hostiles' for all resolution and maps

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5454 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2012-08-08 20:46:36 +00:00
parent e8a6d58175
commit 7e8b51ad34
10 changed files with 56 additions and 44 deletions
+24 -14
View File
@@ -87,10 +87,11 @@ UINT16 iOffsetVertical; // Vertical start position of the overview map
//DBrot: keep track if we should use a bigger version of the overview map for big maps
//for now, this is a custom solution applicable in 1920x1080
BOOLEAN gfUseBiggerOverview = FALSE;
UINT8 ubResolutionTable[6] = {2, 3, 4, 6, 8, 12};
UINT8 ubResolutionTable360[6] = {2, 3, 4, 6, 8, 12};
UINT8 ubResolutionTable160[6] = {1, 1, 2, 4, 4, 5};
UINT8 gubGridDivisor;
#define HORGRIDFRAME 1440
#define VERGRIDFRAME 720
UINT16 gusGridFrameX;
UINT16 gusGridFrameY;
#define SHARPBORDER 1
#define HATCHED 2
//dnl ch45 021009 Current position of map displayed in overhead map, (A=TopLeft, B=BottomLeft, C=TopRight)
@@ -597,12 +598,21 @@ void GoIntoOverheadMap( )
iOffsetHorizontal = (SCREEN_WIDTH / 2) - (640 / 2); // Horizontal start postion of the overview map
iOffsetVertical = (SCREEN_HEIGHT - 160) / 2 - 160; // Vertical start position of the overview map
}
if(NightTime()){
gubGridDivisor = ubResolutionTable[gGameExternalOptions.ubGridResolutionNight];
if(WORLD_MAX == 129600){
if(NightTime()){
gubGridDivisor = ubResolutionTable360[gGameExternalOptions.ubGridResolutionNight];
}else{
gubGridDivisor = ubResolutionTable360[gGameExternalOptions.ubGridResolutionDay];
}
}else{
gubGridDivisor = ubResolutionTable[gGameExternalOptions.ubGridResolutionDay];
if(NightTime()){
gubGridDivisor = ubResolutionTable160[gGameExternalOptions.ubGridResolutionNight];
}else{
gubGridDivisor = ubResolutionTable160[gGameExternalOptions.ubGridResolutionDay];
}
}
gusGridFrameX = WORLD_COLS * 4;
gusGridFrameY = WORLD_ROWS * 2;
MSYS_DefineRegion( &OverheadBackgroundRegion, 0, 0 , SCREEN_WIDTH, SCREEN_HEIGHT, MSYS_PRIORITY_HIGH,
CURSOR_NORMAL, MSYS_NO_CALLBACK, MSYS_NO_CALLBACK );
@@ -1321,18 +1331,18 @@ void RenderOverheadOverlays()
continue;
//DBrot: mark his general area as hostile
if(!gfEditMode && gGameSettings.fOptions[TOPTION_SHOW_LAST_ENEMY] && gfUseBiggerOverview && gGameExternalOptions.ubMarkerMode && gTacticalStatus.Team[ ENEMY_TEAM ].bMenInSector <= gGameExternalOptions.ubSoldiersLeft){
if(!gfEditMode && gGameSettings.fOptions[TOPTION_SHOW_LAST_ENEMY] /*&& gfUseBiggerOverview */&& gGameExternalOptions.ubMarkerMode && gTacticalStatus.Team[ ENEMY_TEAM ].bMenInSector <= gGameExternalOptions.ubSoldiersLeft){
if(pSoldier->bTeam == ENEMY_TEAM){
UINT8 ubGridSquareX, ubGridSquareY;
ubGridSquareX = sX / (HORGRIDFRAME / gubGridDivisor); //( pSoldier->sGridNo / WORLD_COLS ) / ( WORLD_COLS / ubResolutionTable[gGameExternalOptions.ubGridResolution]);
ubGridSquareY = sY / (VERGRIDFRAME / gubGridDivisor); //( pSoldier->sGridNo - ( ( pSoldier->sGridNo / WORLD_COLS ) * WORLD_COLS ) ) / ( WORLD_COLS / ubResolutionTable[gGameExternalOptions.ubGridResolution]);
ubGridSquareX = sX / (gusGridFrameX / gubGridDivisor); //( pSoldier->sGridNo / WORLD_COLS ) / ( WORLD_COLS / ubResolutionTable[gGameExternalOptions.ubGridResolution]);
ubGridSquareY = sY / (gusGridFrameY / gubGridDivisor); //( pSoldier->sGridNo - ( ( pSoldier->sGridNo / WORLD_COLS ) * WORLD_COLS ) ) / ( WORLD_COLS / ubResolutionTable[gGameExternalOptions.ubGridResolution]);
HostileArea.iLeft = iOffsetHorizontal + (((HORGRIDFRAME / gubGridDivisor) * ubGridSquareX));
HostileArea.iTop = iOffsetVertical + (((VERGRIDFRAME / gubGridDivisor) * ubGridSquareY));
HostileArea.iRight = iOffsetHorizontal + (((HORGRIDFRAME / gubGridDivisor) * (ubGridSquareX + 1)));
HostileArea.iBottom = iOffsetVertical + (((VERGRIDFRAME / gubGridDivisor) * (ubGridSquareY + 1)));
HostileArea.iLeft = iOffsetHorizontal + (((gusGridFrameX / gubGridDivisor) * ubGridSquareX));
HostileArea.iTop = iOffsetVertical + (((gusGridFrameY / gubGridDivisor) * ubGridSquareY));
HostileArea.iRight = iOffsetHorizontal + (((gusGridFrameX / gubGridDivisor) * (ubGridSquareX + 1)));
HostileArea.iBottom = iOffsetVertical + (((gusGridFrameY / gubGridDivisor) * (ubGridSquareY + 1)));
if(gGameExternalOptions.ubMarkerMode == SHARPBORDER)
RectangleDraw(TRUE, HostileArea.iLeft, HostileArea.iTop, HostileArea.iRight, HostileArea.iBottom, 255, pDestBuf);
+4 -6
View File
@@ -4960,9 +4960,6 @@ STR16 zSaveLoadText[] =
#else
L"试图载入老版本的存档。你要自动更新并载入存档吗?",
#endif
L"Mark Remaining Hostiles", //TODO.Translate
L"Show LBE Content", //TODO.Translate
L"你确认你要将#%d位置的存档覆盖吗?",
L"你要从#号位置载入存档吗",
@@ -5124,13 +5121,12 @@ STR16 zOptionsToggleText[] =
#ifdef USE_HIGHSPEED_GAMELOOP_TIMER
L"自动加速敌军回合", // Automatic fast forward through AI turns
#endif
L"When ON, approximate locations of the last enemies in the sector are highlighted.", //TODO.Translate
L"When ON, show the contents of an LBE item, otherwise show the regular NAS interface.", //TODO.Translate
#ifdef ENABLE_ZOMBIES
L"Allow Zombies", // TODO.Translate
#endif
L"Enable inventory popups", // the_bob : enable popups for picking items from sector inv // TODO.Translate
L"Mark Remaining Hostiles", //TODO.Translate
L"Show LBE Content", //TODO.Translate
L"--作弊模式选项--", // TOPTION_CHEAT_MODE_OPTIONS_HEADER,
L"强制 Bobby Ray 送货", // force all pending Bobby Ray shipments
L"-----------------", // TOPTION_CHEAT_MODE_OPTIONS_END
@@ -5247,6 +5243,8 @@ STR16 zOptionsScreenHelpText[] =
L"When ON, zombies will span. Be aware!", // allow zombies // TODO.Translate
#endif
L"When ON, enables popup boxes that appear when you left click on empty merc inventory slots while viewing sector inventory in mapscreen.", // TODO.Translate
L"When ON, approximate locations of the last enemies in the sector are highlighted.", //TODO.Translate
L"When ON, show the contents of an LBE item, otherwise show the regular NAS interface.", //TODO.Translate
L"(text not rendered)TOPTION_CHEAT_MODE_OPTIONS_HEADER",
L"强制 Bobby Ray 出货",
L"(text not rendered)TOPTION_CHEAT_MODE_OPTIONS_END",
+4 -5
View File
@@ -4959,8 +4959,6 @@ STR16 zSaveLoadText[] =
#else
L"Attempting to load an older version save. Automatically update and load the save?",
#endif
L"Mark Remaining Hostiles", //TODO.Translate
L"Show LBE Content", //TODO.Translate
L"Weet je zeker dat je het spel in slot #%d wil overschrijven?",
L"Wil je het spel laden van slot #",
@@ -5123,13 +5121,12 @@ STR16 zOptionsToggleText[] =
#ifdef USE_HIGHSPEED_GAMELOOP_TIMER
L"Auto Fast Forward AI Turns", // Automatic fast forward through AI turns // TODO.Translate
#endif
L"When ON, approximate locations of the last enemies in the sector are highlighted.", //TODO.Translate
L"When ON, show the contents of an LBE item, otherwise show the regular NAS interface.", //TODO.Translate
#ifdef ENABLE_ZOMBIES
L"Allow Zombies", // TODO.Translate
#endif
L"Enable inventory popups", // the_bob : enable popups for picking items from sector inv // TODO.Translate
L"Mark Remaining Hostiles", //TODO.Translate
L"Show LBE Content", //TODO.Translate
L"--Cheat Mode Options--", // TOPTION_CHEAT_MODE_OPTIONS_HEADER,
L"Force Bobby Ray shipments", // force all pending Bobby Ray shipments
L"-----------------", // TOPTION_CHEAT_MODE_OPTIONS_END
@@ -5246,6 +5243,8 @@ STR16 zOptionsScreenHelpText[] =
L"When ON, zombies will span. Be aware!", // allow zombies // TODO.Translate
#endif
L"When ON, enables popup boxes that appear when you left click on empty merc inventory slots while viewing sector inventory in mapscreen.", // TODO.Translate
L"When ON, approximate locations of the last enemies in the sector are highlighted.", //TODO.Translate
L"When ON, show the contents of an LBE item, otherwise show the regular NAS interface.", //TODO.Translate
L"(text not rendered)TOPTION_CHEAT_MODE_OPTIONS_HEADER",
L"Force all pending Bobby Ray shipments",
L"(text not rendered)TOPTION_CHEAT_MODE_OPTIONS_END",
-2
View File
@@ -4958,8 +4958,6 @@ STR16 zSaveLoadText[] =
#else
L"Attempting to load an older version save. Automatically update and load the save?",
#endif
L"Mark Remaining Hostiles",
L"Show LBE Content",
L"Are you sure you want to overwrite the saved game in slot #%d?",
L"Do you want to load the game from slot #",
+4 -5
View File
@@ -4949,8 +4949,6 @@ STR16 zSaveLoadText[] =
#else
L"Tentative de chargement d'une sauvegarde de version précédente. Voulez-vous effectuer une mise à jour?",
#endif
L"Mark Remaining Hostiles", //TODO.Translate
L"Show LBE Content", //TODO.Translate
L"Etes-vous sûr de vouloir écraser la sauvegarde #%d ?",
L"Voulez-vous charger la sauvegarde #%d ?",
@@ -5113,13 +5111,12 @@ STR16 zOptionsToggleText[] =
#ifdef USE_HIGHSPEED_GAMELOOP_TIMER
L"Auto Fast Forward AI Turns", // Automatic fast forward through AI turns // TODO.Translate
#endif
L"When ON, approximate locations of the last enemies in the sector are highlighted.", //TODO.Translate
L"When ON, show the contents of an LBE item, otherwise show the regular NAS interface.", //TODO.Translate
#ifdef ENABLE_ZOMBIES
L"Allow Zombies", // Flugente Zombies 1.0
#endif
L"Enable inventory popups", // the_bob : enable popups for picking items from sector inv // TODO.Translate
L"Mark Remaining Hostiles", //TODO.Translate
L"Show LBE Content", //TODO.Translate
L"--Cheat Mode Options--", // TOPTION_CHEAT_MODE_OPTIONS_HEADER,
L"Forcer envois Bobby Ray", // force all pending Bobby Ray shipments
L"-----------------", // TOPTION_CHEAT_MODE_OPTIONS_END
@@ -5236,6 +5233,8 @@ STR16 zOptionsScreenHelpText[] =
L"When ON, zombies will span. Be aware!", // allow zombies // TODO.Translate
#endif
L"When ON, enables popup boxes that appear when you left click on empty merc inventory slots while viewing sector inventory in mapscreen.", // TODO.Translate
L"When ON, approximate locations of the last enemies in the sector are highlighted.", //TODO.Translate
L"When ON, show the contents of an LBE item, otherwise show the regular NAS interface.", //TODO.Translate
L"(text not rendered)TOPTION_CHEAT_MODE_OPTIONS_HEADER",
L"Forcer tous les envois en attente de Bobby Ray",
L"(text not rendered)TOPTION_CHEAT_MODE_OPTIONS_END",
+4 -6
View File
@@ -4806,9 +4806,6 @@ STR16 zSaveLoadText[] =
#else
L"Versuche, älteren Spielstand zu laden. Laden und automatisch aktualisieren?",
#endif
L"Mark Remaining Hostiles", //TODO.Translate
L"Show LBE Content", //TODO.Translate
L"Gespeichertes Spiel in Position #%d wirklich überschreiben?",
L"Wollen Sie das Spiel aus Position # speichern?",
@@ -4971,13 +4968,12 @@ STR16 zOptionsToggleText[] =
#ifdef USE_HIGHSPEED_GAMELOOP_TIMER
L"Autom. schnelle Gegner-Züge", // Automatic fast forward through AI turns
#endif
L"When ON, approximate locations of the last enemies in the sector are highlighted.", //TODO.Translate
L"When ON, show the contents of an LBE item, otherwise show the regular NAS interface.", //TODO.Translate
#ifdef ENABLE_ZOMBIES
L"Zombies erlauben", // Flugente Zombies 1.0
#endif
L"Inventar Popup-Menüs", // the_bob : enable popups for picking items from sector inv
L"Übrige Feinde markieren",
L"Tascheninhalt anzeigen",
L"--Cheat Mode Options--", // TOPTION_CHEAT_MODE_OPTIONS_HEADER,
L"Erzwinge BR Lieferung", // force all pending Bobby Ray shipments
L"-----------------", // TOPTION_CHEAT_MODE_OPTIONS_END
@@ -5094,6 +5090,8 @@ STR16 zOptionsScreenHelpText[] =
L"Wenn diese Funktion aktiviert ist, können Tote als Zombies wieder auferstehen. Seien Sie auf der Hut!",
#endif
L"Wenn diese Funktion aktiviert ist, und Sie mit der linken Maustaste auf einen freien Söldner-Inventarplatz klicken (während das Sektor-Inventar angezeigt wird), wird ein hilfreiches Popup-Menü eingeblendet.",
L"Wenn diese Funktion aktiviert ist, wird die ungefähre Postion der verbleibenden Feinde auf der Übersichtskarte schraffiert",
L"Wenn diese Funktion aktiviert ist, wird in der erweiterten Beschreibung von Tashen statt den Anbauteilen deren Inhalt angezeigt.",
L"(text not rendered)TOPTION_CHEAT_MODE_OPTIONS_HEADER",
L"Force all pending Bobby Ray shipments",
L"(text not rendered)TOPTION_CHEAT_MODE_OPTIONS_END",
+4 -6
View File
@@ -4946,9 +4946,6 @@ STR16 zSaveLoadText[] =
#else
L"Tentativo di caricare una vecchia versione salvata. Aggiornate e caricate automaticamente quella salvata?",
#endif
L"Mark Remaining Hostiles", //TODO.Translate
L"Show LBE Content", //TODO.Translate
L"Siete sicuri di volere sovrascrivere la partita salvata nello slot #%d?",
L"Volete caricare la partita dallo slot #",
@@ -5108,13 +5105,12 @@ STR16 zOptionsToggleText[] =
#ifdef USE_HIGHSPEED_GAMELOOP_TIMER
L"Auto Fast Forward AI Turns", // Automatic fast forward through AI turns // TODO.Translate
#endif
L"When ON, approximate locations of the last enemies in the sector are highlighted.", //TODO.Translate
L"When ON, show the contents of an LBE item, otherwise show the regular NAS interface.", //TODO.Translate
#ifdef ENABLE_ZOMBIES
L"Allow Zombies", // Flugente Zombies 1.0
#endif
L"Enable inventory popups", // the_bob : enable popups for picking items from sector inv // TODO.Translate
L"Mark Remaining Hostiles", //TODO.Translate
L"Show LBE Content", //TODO.Translate
L"--Cheat Mode Options--", // TOPTION_CHEAT_MODE_OPTIONS_HEADER,
L"Force Bobby Ray shipments", // force all pending Bobby Ray shipments
L"-----------------", // TOPTION_CHEAT_MODE_OPTIONS_END
@@ -5231,6 +5227,8 @@ STR16 zOptionsScreenHelpText[] =
L"When ON, zombies will span. Be aware!", // allow zombies // TODO.Translate
#endif
L"When ON, enables popup boxes that appear when you left click on empty merc inventory slots while viewing sector inventory in mapscreen.", // TODO.Translate
L"When ON, approximate locations of the last enemies in the sector are highlighted.", //TODO.Translate
L"When ON, show the contents of an LBE item, otherwise show the regular NAS interface.", //TODO.Translate
L"(text not rendered)TOPTION_CHEAT_MODE_OPTIONS_HEADER",
L"Force all pending Bobby Ray shipments",
L"(text not rendered)TOPTION_CHEAT_MODE_OPTIONS_END",
+4
View File
@@ -5123,6 +5123,8 @@ STR16 zOptionsToggleText[] =
L"Allow Zombies", // Flugente Zombies 1.0
#endif
L"Enable inventory popups", // the_bob : enable popups for picking items from sector inv // TODO.Translate
L"Mark Remaining Hostiles", //TODO.Translate
L"Show LBE Content", //TODO.Translate
L"--Cheat Mode Options--", // TOPTION_CHEAT_MODE_OPTIONS_HEADER,
L"Force Bobby Ray shipments", // force all pending Bobby Ray shipments
L"-----------------", // TOPTION_CHEAT_MODE_OPTIONS_END
@@ -5239,6 +5241,8 @@ STR16 zOptionsScreenHelpText[] =
L"When ON, zombies will span. Be aware!", // allow zombies // TODO.Translate
#endif
L"When ON, enables popup boxes that appear when you left click on empty merc inventory slots while viewing sector inventory in mapscreen.", // TODO.Translate
L"When ON, approximate locations of the last enemies in the sector are highlighted.", //TODO.Translate
L"When ON, show the contents of an LBE item, otherwise show the regular NAS interface.", //TODO.Translate
L"(text not rendered)TOPTION_CHEAT_MODE_OPTIONS_HEADER",
L"WymuŚ wszystkie oczekiwane dostawy od Bobby Ray's.",
L"(text not rendered)TOPTION_CHEAT_MODE_OPTIONS_END",
+4
View File
@@ -5106,6 +5106,8 @@ STR16 zOptionsToggleText[] =
L"Allow Zombies", // Flugente Zombies 1.0
#endif
L"Enable inventory popups", // the_bob : enable popups for picking items from sector inv // TODO.Translate
L"Mark Remaining Hostiles", //TODO.Translate
L"Show LBE Content", //TODO.Translate
L"--Читерские настройки--", // TOPTION_CHEAT_MODE_OPTIONS_HEADER,
L"Ускорить доставку Бобби Рэя", // force all pending Bobby Ray shipments
L"-----------------", // TOPTION_CHEAT_MODE_OPTIONS_END
@@ -5222,6 +5224,8 @@ STR16 zOptionsScreenHelpText[] =
L"When ON, zombies will span. Be aware!", // allow zombies // TODO.Translate
#endif
L"When ON, enables popup boxes that appear when you left click on empty merc inventory slots while viewing sector inventory in mapscreen.", // TODO.Translate
L"When ON, approximate locations of the last enemies in the sector are highlighted.", //TODO.Translate
L"When ON, show the contents of an LBE item, otherwise show the regular NAS interface.", //TODO.Translate
L"(text not rendered)TOPTION_CHEAT_MODE_OPTIONS_HEADER",
L"Выберите этот пункт чтобы груз Бобби Рэя прибыл немедленно.",
L"(text not rendered)TOPTION_CHEAT_MODE_OPTIONS_END",
+4
View File
@@ -5127,6 +5127,8 @@ STR16 zOptionsToggleText[] =
L"Allow Zombies", // Flugente Zombies 1.0
#endif
L"Enable inventory popups", // the_bob : enable popups for picking items from sector inv // TODO.Translate
L"Mark Remaining Hostiles", //TODO.Translate
L"Show LBE Content", //TODO.Translate
L"--Cheat Mode Options--", // TOPTION_CHEAT_MODE_OPTIONS_HEADER,
L"Force Bobby Ray shipments", // force all pending Bobby Ray shipments
L"-----------------", // TOPTION_CHEAT_MODE_OPTIONS_END
@@ -5243,6 +5245,8 @@ STR16 zOptionsScreenHelpText[] =
L"When ON, zombies will span. Be aware!", // allow zombies // TODO.Translate
#endif
L"When ON, enables popup boxes that appear when you left click on empty merc inventory slots while viewing sector inventory in mapscreen.", // TODO.Translate
L"When ON, approximate locations of the last enemies in the sector are highlighted.", //TODO.Translate
L"When ON, show the contents of an LBE item, otherwise show the regular NAS interface.", //TODO.Translate
L"(text not rendered)TOPTION_CHEAT_MODE_OPTIONS_HEADER",
L"Force all pending Bobby Ray shipments",
L"(text not rendered)TOPTION_CHEAT_MODE_OPTIONS_END",