From 967f5813889d52ca9679a4e807b5aeda5987a2ea Mon Sep 17 00:00:00 2001 From: Marco Antonio Jaguaribe Costa Date: Tue, 17 Jan 2023 18:24:24 -0300 Subject: [PATCH 1/3] Remove option to disable 'Mercs Lights during Movement" This might've cost someone some frames in 1999, but today even a 10 year old smartphone can probably run with this turned on at 1080p without dropping a sweat This does not remove the menu option which I plan to replace with 'Highlight Mercs' which was hidden for some reason. 'Merc Lights during Movement' is a noop now tho --- GameSettings.cpp | 3 --- GameSettings.h | 1 - Tactical/Overhead.cpp | 6 ------ Tactical/Soldier Control.cpp | 5 +---- 4 files changed, 1 insertion(+), 14 deletions(-) diff --git a/GameSettings.cpp b/GameSettings.cpp index 7981d3008..10d85a459 100644 --- a/GameSettings.cpp +++ b/GameSettings.cpp @@ -284,7 +284,6 @@ BOOLEAN LoadGameSettings() gGameSettings.fOptions[TOPTION_RTCONFIRM] = iniReader.ReadBoolean("JA2 Game Settings","TOPTION_RTCONFIRM" , FALSE ); gGameSettings.fOptions[TOPTION_SLEEPWAKE_NOTIFICATION] = iniReader.ReadBoolean("JA2 Game Settings","TOPTION_SLEEPWAKE_NOTIFICATION" , TRUE ); gGameSettings.fOptions[TOPTION_USE_METRIC_SYSTEM] = iniReader.ReadBoolean("JA2 Game Settings","TOPTION_USE_METRIC_SYSTEM" , TRUE ); - gGameSettings.fOptions[TOPTION_MERC_ALWAYS_LIGHT_UP] = iniReader.ReadBoolean("JA2 Game Settings","TOPTION_MERC_ALWAYS_LIGHT_UP" , FALSE ); gGameSettings.fOptions[TOPTION_SMART_CURSOR] = iniReader.ReadBoolean("JA2 Game Settings","TOPTION_SMART_CURSOR" , FALSE ); gGameSettings.fOptions[TOPTION_SNAP_CURSOR_TO_DOOR] = iniReader.ReadBoolean("JA2 Game Settings","TOPTION_SNAP_CURSOR_TO_DOOR" , TRUE ); gGameSettings.fOptions[TOPTION_GLOW_ITEMS] = iniReader.ReadBoolean("JA2 Game Settings","TOPTION_GLOW_ITEMS" , TRUE ); @@ -572,7 +571,6 @@ BOOLEAN SaveGameSettings() settings << "TOPTION_RTCONFIRM = " << (gGameSettings.fOptions[TOPTION_RTCONFIRM] ? "TRUE" : "FALSE" ) << endl; settings << "TOPTION_SLEEPWAKE_NOTIFICATION = " << (gGameSettings.fOptions[TOPTION_SLEEPWAKE_NOTIFICATION] ? "TRUE" : "FALSE" ) << endl; settings << "TOPTION_USE_METRIC_SYSTEM = " << (gGameSettings.fOptions[TOPTION_USE_METRIC_SYSTEM] ? "TRUE" : "FALSE" ) << endl; - settings << "TOPTION_MERC_ALWAYS_LIGHT_UP = " << (gGameSettings.fOptions[TOPTION_MERC_ALWAYS_LIGHT_UP] ? "TRUE" : "FALSE" ) << endl; settings << "TOPTION_SMART_CURSOR = " << (gGameSettings.fOptions[TOPTION_SMART_CURSOR] ? "TRUE" : "FALSE" ) << endl; settings << "TOPTION_SNAP_CURSOR_TO_DOOR = " << (gGameSettings.fOptions[TOPTION_SNAP_CURSOR_TO_DOOR] ? "TRUE" : "FALSE" ) << endl; settings << "TOPTION_GLOW_ITEMS = " << (gGameSettings.fOptions[TOPTION_GLOW_ITEMS] ? "TRUE" : "FALSE" ) << endl; @@ -777,7 +775,6 @@ void InitGameSettings() gGameSettings.fOptions[ TOPTION_RTCONFIRM ] = FALSE; gGameSettings.fOptions[ TOPTION_SLEEPWAKE_NOTIFICATION ] = TRUE; gGameSettings.fOptions[ TOPTION_USE_METRIC_SYSTEM ] = TRUE; - gGameSettings.fOptions[ TOPTION_MERC_ALWAYS_LIGHT_UP ] = FALSE; gGameSettings.fOptions[ TOPTION_SMART_CURSOR ] = FALSE; gGameSettings.fOptions[ TOPTION_SNAP_CURSOR_TO_DOOR ] = TRUE; gGameSettings.fOptions[ TOPTION_GLOW_ITEMS ] = TRUE; diff --git a/GameSettings.h b/GameSettings.h index 5f5db0adc..5fadf6739 100644 --- a/GameSettings.h +++ b/GameSettings.h @@ -33,7 +33,6 @@ enum // TOPTION_DISPLAY_ENEMY_INDICATOR, //Displays the number of enemies seen by the merc, ontop of their portrait TOPTION_SLEEPWAKE_NOTIFICATION, TOPTION_USE_METRIC_SYSTEM, //If set, uses the metric system - TOPTION_MERC_ALWAYS_LIGHT_UP, TOPTION_SMART_CURSOR, TOPTION_SNAP_CURSOR_TO_DOOR, TOPTION_GLOW_ITEMS, diff --git a/Tactical/Overhead.cpp b/Tactical/Overhead.cpp index 81f265f97..0148b9a5e 100644 --- a/Tactical/Overhead.cpp +++ b/Tactical/Overhead.cpp @@ -1178,12 +1178,6 @@ BOOLEAN ExecuteOverhead( ) pSoldier->flags.fSoldierWasMoving = FALSE; HandlePlacingRoofMarker( pSoldier, pSoldier->sGridNo, TRUE, FALSE ); - - if ( !gGameSettings.fOptions[ TOPTION_MERC_ALWAYS_LIGHT_UP ] ) - { - pSoldier->DeleteSoldierLight( ); - pSoldier->SetCheckSoldierLightFlag( ); - } } } else diff --git a/Tactical/Soldier Control.cpp b/Tactical/Soldier Control.cpp index 7439c1bdf..0fb5bcf00 100644 --- a/Tactical/Soldier Control.cpp +++ b/Tactical/Soldier Control.cpp @@ -4578,10 +4578,7 @@ void SOLDIERTYPE::EVENT_InternalSetSoldierPosition( FLOAT dNewXPos, FLOAT dNewYP if ( !(this->flags.uiStatusFlags & (SOLDIER_DRIVER | SOLDIER_PASSENGER)) ) { - if ( gGameSettings.fOptions[TOPTION_MERC_ALWAYS_LIGHT_UP] ) - { - this->SetCheckSoldierLightFlag( ); - } + this->SetCheckSoldierLightFlag( ); } // ATE: Mirror calls if we are a vehicle ( for all our passengers ) From 4a2690ffe1bc11f3d5e3b8362493c2b56189bb94 Mon Sep 17 00:00:00 2001 From: Marco Antonio Jaguaribe Costa Date: Tue, 17 Jan 2023 20:17:07 -0300 Subject: [PATCH 2/3] Replace 'Merc Lights during movement' with 'Highlight Mercs' as title --- GameSettings.cpp | 7 +++---- GameSettings.h | 3 +-- Utils/_ChineseText.cpp | 6 +++--- Utils/_DutchText.cpp | 6 +++--- Utils/_EnglishText.cpp | 6 +++--- Utils/_FrenchText.cpp | 6 +++--- Utils/_GermanText.cpp | 6 +++--- Utils/_ItalianText.cpp | 6 +++--- Utils/_PolishText.cpp | 6 +++--- Utils/_RussianText.cpp | 6 +++--- 10 files changed, 28 insertions(+), 30 deletions(-) diff --git a/GameSettings.cpp b/GameSettings.cpp index 10d85a459..99b957ac6 100644 --- a/GameSettings.cpp +++ b/GameSettings.cpp @@ -284,6 +284,7 @@ BOOLEAN LoadGameSettings() gGameSettings.fOptions[TOPTION_RTCONFIRM] = iniReader.ReadBoolean("JA2 Game Settings","TOPTION_RTCONFIRM" , FALSE ); gGameSettings.fOptions[TOPTION_SLEEPWAKE_NOTIFICATION] = iniReader.ReadBoolean("JA2 Game Settings","TOPTION_SLEEPWAKE_NOTIFICATION" , TRUE ); gGameSettings.fOptions[TOPTION_USE_METRIC_SYSTEM] = iniReader.ReadBoolean("JA2 Game Settings","TOPTION_USE_METRIC_SYSTEM" , TRUE ); + gGameSettings.fOptions[TOPTION_MERC_CASTS_LIGHT] = iniReader.ReadBoolean("JA2 Game Settings", "TOPTION_MERC_CASTS_LIGHT", TRUE); gGameSettings.fOptions[TOPTION_SMART_CURSOR] = iniReader.ReadBoolean("JA2 Game Settings","TOPTION_SMART_CURSOR" , FALSE ); gGameSettings.fOptions[TOPTION_SNAP_CURSOR_TO_DOOR] = iniReader.ReadBoolean("JA2 Game Settings","TOPTION_SNAP_CURSOR_TO_DOOR" , TRUE ); gGameSettings.fOptions[TOPTION_GLOW_ITEMS] = iniReader.ReadBoolean("JA2 Game Settings","TOPTION_GLOW_ITEMS" , TRUE ); @@ -352,7 +353,6 @@ BOOLEAN LoadGameSettings() gGameSettings.fOptions[TOPTION_DEBUG_MODE_OPTIONS_END] = iniReader.ReadBoolean("JA2 Game Settings","TOPTION_DEBUG_MODE_OPTIONS_END" , FALSE ); gGameSettings.fOptions[TOPTION_LAST_OPTION] = iniReader.ReadBoolean("JA2 Game Settings","TOPTION_LAST_OPTION" , FALSE ); gGameSettings.fOptions[NUM_GAME_OPTIONS] = iniReader.ReadBoolean("JA2 Game Settings","NUM_GAME_OPTIONS" , FALSE ); - gGameSettings.fOptions[TOPTION_MERC_CASTS_LIGHT] = iniReader.ReadBoolean("JA2 Game Settings","TOPTION_MERC_CASTS_LIGHT" , TRUE ); gGameSettings.fOptions[TOPTION_HIDE_BULLETS] = iniReader.ReadBoolean("JA2 Game Settings","TOPTION_HIDE_BULLETS" , FALSE ); gGameSettings.fOptions[TOPTION_TRACKING_MODE] = iniReader.ReadBoolean("JA2 Game Settings","TOPTION_TRACKING_MODE" , TRUE ); gGameSettings.fOptions[TOPTION_DISABLE_CURSOR_SWAP] = iniReader.ReadBoolean("JA2 Game Settings","TOPTION_DISABLE_CURSOR_SWAP" , FALSE ); @@ -571,6 +571,7 @@ BOOLEAN SaveGameSettings() settings << "TOPTION_RTCONFIRM = " << (gGameSettings.fOptions[TOPTION_RTCONFIRM] ? "TRUE" : "FALSE" ) << endl; settings << "TOPTION_SLEEPWAKE_NOTIFICATION = " << (gGameSettings.fOptions[TOPTION_SLEEPWAKE_NOTIFICATION] ? "TRUE" : "FALSE" ) << endl; settings << "TOPTION_USE_METRIC_SYSTEM = " << (gGameSettings.fOptions[TOPTION_USE_METRIC_SYSTEM] ? "TRUE" : "FALSE" ) << endl; + settings << "TOPTION_MERC_CASTS_LIGHT = " << (gGameSettings.fOptions[TOPTION_MERC_CASTS_LIGHT] ? "TRUE" : "FALSE") << endl; settings << "TOPTION_SMART_CURSOR = " << (gGameSettings.fOptions[TOPTION_SMART_CURSOR] ? "TRUE" : "FALSE" ) << endl; settings << "TOPTION_SNAP_CURSOR_TO_DOOR = " << (gGameSettings.fOptions[TOPTION_SNAP_CURSOR_TO_DOOR] ? "TRUE" : "FALSE" ) << endl; settings << "TOPTION_GLOW_ITEMS = " << (gGameSettings.fOptions[TOPTION_GLOW_ITEMS] ? "TRUE" : "FALSE" ) << endl; @@ -631,7 +632,6 @@ BOOLEAN SaveGameSettings() settings << ";******************************************************************************************************************************" << endl; settings << "TOPTION_LAST_OPTION = " << (gGameSettings.fOptions[TOPTION_LAST_OPTION] ? "TRUE" : "FALSE" ) << endl; settings << "NUM_GAME_OPTIONS = " << (gGameSettings.fOptions[NUM_GAME_OPTIONS] ? "TRUE" : "FALSE" ) << endl; - settings << "TOPTION_MERC_CASTS_LIGHT = " << (gGameSettings.fOptions[TOPTION_MERC_CASTS_LIGHT] ? "TRUE" : "FALSE" ) << endl; settings << "TOPTION_HIDE_BULLETS = " << (gGameSettings.fOptions[TOPTION_HIDE_BULLETS] ? "TRUE" : "FALSE" ) << endl; settings << "TOPTION_TRACKING_MODE = " << (gGameSettings.fOptions[TOPTION_TRACKING_MODE] ? "TRUE" : "FALSE" ) << endl; settings << "NUM_ALL_GAME_OPTIONS = " << (gGameSettings.fOptions[NUM_ALL_GAME_OPTIONS] ? "TRUE" : "FALSE" ) << endl; @@ -775,6 +775,7 @@ void InitGameSettings() gGameSettings.fOptions[ TOPTION_RTCONFIRM ] = FALSE; gGameSettings.fOptions[ TOPTION_SLEEPWAKE_NOTIFICATION ] = TRUE; gGameSettings.fOptions[ TOPTION_USE_METRIC_SYSTEM ] = TRUE; + gGameSettings.fOptions[TOPTION_MERC_CASTS_LIGHT] = TRUE; gGameSettings.fOptions[ TOPTION_SMART_CURSOR ] = FALSE; gGameSettings.fOptions[ TOPTION_SNAP_CURSOR_TO_DOOR ] = TRUE; gGameSettings.fOptions[ TOPTION_GLOW_ITEMS ] = TRUE; @@ -867,8 +868,6 @@ void InitGameSettings() gGameSettings.fOptions[ NUM_GAME_OPTIONS ] = FALSE; // Toggles prior to this will be able to be toggled by the player // JA2Gold - gGameSettings.fOptions[ TOPTION_MERC_CASTS_LIGHT ] = TRUE; - gGameSettings.fOptions[ TOPTION_HIDE_BULLETS ] = FALSE; gGameSettings.fOptions[ TOPTION_TRACKING_MODE ] = TRUE; diff --git a/GameSettings.h b/GameSettings.h index 5fadf6739..dd2520209 100644 --- a/GameSettings.h +++ b/GameSettings.h @@ -33,6 +33,7 @@ enum // TOPTION_DISPLAY_ENEMY_INDICATOR, //Displays the number of enemies seen by the merc, ontop of their portrait TOPTION_SLEEPWAKE_NOTIFICATION, TOPTION_USE_METRIC_SYSTEM, //If set, uses the metric system + TOPTION_MERC_CASTS_LIGHT, TOPTION_SMART_CURSOR, TOPTION_SNAP_CURSOR_TO_DOOR, TOPTION_GLOW_ITEMS, @@ -126,8 +127,6 @@ enum //These options will NOT be toggable by the Player // JA2Gold - TOPTION_MERC_CASTS_LIGHT, - TOPTION_HIDE_BULLETS, TOPTION_TRACKING_MODE, diff --git a/Utils/_ChineseText.cpp b/Utils/_ChineseText.cpp index 8ab30522e..11abdae26 100644 --- a/Utils/_ChineseText.cpp +++ b/Utils/_ChineseText.cpp @@ -6532,7 +6532,7 @@ STR16 zOptionsToggleText[] = L"实时确认", //"Real Time Confirmation", L"显示睡觉/醒来时的提示", //"Display sleep/wake notifications", L"使用公制系统", //"Use Metric System", - L"佣兵移动时高亮显示", //"Merc Lights during Movement", + L"佣兵假光", //"Highlight Mercs", L"锁定佣兵", //"Snap Cursor to Mercs", L"锁定门", //"Snap Cursor to Doors", L"物品闪亮", //"Make Items Glow", @@ -6634,8 +6634,8 @@ STR16 zOptionsScreenHelpText[] = //Use the metric system L"打开时，使用公制系统，否则使用英制系统。", - //Merc Lighted movement - L"打开时，佣兵移动时会照亮地表，切换虚拟佣兵光照。（|G）\n（关闭这个选项会使游戏的显示速度变快）", + //Highlight Mercs + L"打开时，切换虚拟佣兵照明。（|G）", //Smart cursor L"打开时，光标移动到佣兵身上时会高亮显示佣兵。", diff --git a/Utils/_DutchText.cpp b/Utils/_DutchText.cpp index 97a534ed2..93688f68d 100644 --- a/Utils/_DutchText.cpp +++ b/Utils/_DutchText.cpp @@ -6534,7 +6534,7 @@ STR16 zOptionsToggleText[] = L"Bevestiging Real-Time", L"Slaap/wakker-berichten", L"Metrieke Stelsel", - L"Huurling Oplichten", + L"Licht Huurlingen Op", L"Auto-Cursor naar Huurling", L"Auto-Cursor naar Deuren", L"Items Oplichten", @@ -6636,8 +6636,8 @@ STR16 zOptionsScreenHelpText[] = //Use the metric system L"Wanneer INGESCHAKELD wordt het metrieke stelsel gebruikt, anders het Imperiale stelsel.", - //Merc Lighted movement - L"Wanneer INGESCHAKELD, de huurling verlicht de grond tijdens het lopen. Schakel UIT voor sneller spelen.\nToggle artificial merc light. (|G)", // TODO.Translate + //Highlight Mercs + L"Wanneer INGESCHAKELD, wordt de huurling gemarkeerd (niet zichtbaar voor vijanden).\nSchakel in het spel met (|G)", //Smart cursor L"Wanneer INGESCHAKELD zullen huurlingen dichtbij de cursor automatisch oplichten.", diff --git a/Utils/_EnglishText.cpp b/Utils/_EnglishText.cpp index d56f2cbf0..4ea9f73e6 100644 --- a/Utils/_EnglishText.cpp +++ b/Utils/_EnglishText.cpp @@ -6532,7 +6532,7 @@ STR16 zOptionsToggleText[] = L"Real Time Confirmation", L"Sleep/Wake Notifications", L"Use Metric System", - L"Merc Lights during Movement", + L"Highlight Mercs", L"Snap Cursor to Mercs", L"Snap Cursor to Doors", L"Make Items Glow", @@ -6634,8 +6634,8 @@ STR16 zOptionsScreenHelpText[] = //Use the metric system L"When ON, uses the metric system for measurements; otherwise it uses the Imperial system.", - //Merc Lighted movement - L"When ON, the merc will light the ground while walking. Turn OFF for faster frame rate.\nToggle artificial merc light. (|G)", + //Highlight Mercs + L"When ON, highlights the mercenary (Not visible to enemies).\nToggle in-game with (|G)", //Smart cursor L"When ON, moving the cursor near your mercs will automatically highlight them.", diff --git a/Utils/_FrenchText.cpp b/Utils/_FrenchText.cpp index 07bacfb1f..04f7211fd 100644 --- a/Utils/_FrenchText.cpp +++ b/Utils/_FrenchText.cpp @@ -6539,7 +6539,7 @@ STR16 zOptionsToggleText[] = L"Confirmation temps réel", L"Notifications sommeil/réveil", L"Système métrique", - L"Mouvemts mercenaires éclairés", + L"Mettez en surbrillance les mercenaires", L"Figer curseur sur mercenaires", L"Figer curseur sur les portes", L"Objets en surbrillance", @@ -6641,8 +6641,8 @@ STR16 zOptionsScreenHelpText[] = //Use the metric system L"Activez cette option pour que le jeu utilise le système métrique.", - //Merc Lighted movement - L"Activez cette option pour éclairer les environs des mercenaires.Désactivez-la, si votre machine n'est pas suffisamment puissante.\nBasculera éclairage du mercenaire. (|G)", + //Highlight Mercs + L"Lorsqu'il est activé, le mercenaire est mis en surbrillance (invisible pour les ennemis).\nBasculer dans le jeu avec (|G)", //Smart cursor L"Activez cette option pour que le curseur se positionne directement sur un mercenaire quand il est à proximité.", diff --git a/Utils/_GermanText.cpp b/Utils/_GermanText.cpp index ccfa579f9..b7d4b8df8 100644 --- a/Utils/_GermanText.cpp +++ b/Utils/_GermanText.cpp @@ -6405,7 +6405,7 @@ STR16 zOptionsToggleText[] = L"Bestätigung bei Echtzeit", L"Schlaf-/Wachmeldung anzeigen", L"Metrisches System benutzen", - L"Boden beleuchten", + L"Markieren Sie Söldner", L"Cursor autom. auf Söldner", L"Cursor autom. auf Türen", L"Gegenstände leuchten", @@ -6507,8 +6507,8 @@ STR16 zOptionsScreenHelpText[] = //Use the metric system L"Mit dieser Option wird im Spiel das metrische anstelle des imperialen Maßsystems verwendet (z.B. Meter und Kilogramm).", - //Merc Lighted movement - L"Diese Funktion beleuchtet für den Spieler die Umgebung des Söldners - auch beim Bewegen. AUSgeschaltet erhöht sich die Bildwiederholrate.\nToggle artificial merc light. (|G)", // TODO.Translate + //Highlight Mercs + L"Wenn AN, wird der Söldner hervorgehoben (für Feinde nicht sichtbar).\nIm Spiel umschalten mit (|G)", //Smart cursor L"Wenn diese Funktion aktiviert ist, springt der Cursor immer automatisch auf Söldner in seiner direkten Nähe.", diff --git a/Utils/_ItalianText.cpp b/Utils/_ItalianText.cpp index 9e3f0ded4..dbe3f784d 100644 --- a/Utils/_ItalianText.cpp +++ b/Utils/_ItalianText.cpp @@ -6517,7 +6517,7 @@ STR16 zOptionsToggleText[] = L"Conferma in tempo reale", L"Visualizza gli avvertimenti sveglio/addormentato", L"Utilizza il sistema metrico", - L"Tragitto illuminato durante gli spostamenti", + L"Evidenzia Merc", L"Sposta il cursore sui mercenari", L"Sposta il cursore sulle porte", L"Evidenzia gli oggetti", @@ -6619,8 +6619,8 @@ STR16 zOptionsScreenHelpText[] = //Use the metric system L"Se attivata, utilizza il sistema metrico di misurazione; altrimenti ricorre al sistema britannico.", - //Merc Lighted movement - L"Se attivata, il mercenario mostrerà il terreno su cui cammina. Disattivatela per un aggiornamento più veloce.\nToggle artificial merc light. (|G)", // TODO.Translate + //Highlight Mercs + L"Quando attivato, evidenzia il mercenario (non visibile ai nemici).\nAttiva/disattiva nel gioco con (|G)", //Smart cursor L"Se attivata, muovendo il cursore vicino ai vostri mercenari li evidenzierà automaticamente.", diff --git a/Utils/_PolishText.cpp b/Utils/_PolishText.cpp index 5ebff373c..8fec10a92 100644 --- a/Utils/_PolishText.cpp +++ b/Utils/_PolishText.cpp @@ -6535,7 +6535,7 @@ STR16 zOptionsToggleText[] = L"Potwierdzenia Real-Time", L"Najemnik śpi/budzi się", L"Używaj systemu metrycznego", - L"Oświetlenie podczas ruchu", + L"Wyróżnij najemników", L"Przyciągaj kursor do najemników", L"Przyciągaj kursor do drzwi", L"Pulsujące przedmioty", @@ -6638,8 +6638,8 @@ STR16 zOptionsScreenHelpText[] = //Use the metric system L"Jeśli WŁĄCZONE, gra będzie używała systemu metrycznego.", - //Merc Lighted movement - L"Jeśli WŁĄCZONE, teren wokół najemnika będzie oświetlony podczas ruchu. Może spowolnić działanie gry.\nToggle artificial merc light. (|G)", // TODO.Translate + //Highlight Mercs + L"Gdy jest włączony, podświetla najemnika (niewidoczny dla wrogów).\nPrzełącz w grze za pomocą (|G)", //Smart cursor L"Jeśli WŁĄCZONE, kursor będzie automatycznie ustawiał się na najemnikach gdy znajdzie się w ich pobliżu.", diff --git a/Utils/_RussianText.cpp b/Utils/_RussianText.cpp index 4078205f2..e620eb527 100644 --- a/Utils/_RussianText.cpp +++ b/Utils/_RussianText.cpp @@ -6528,7 +6528,7 @@ STR16 zOptionsToggleText[] = L"Игра в реальном времени", L"Подтверждение сна/подъема", L"Метрическая система", - L"Движущаяся подсветка бойца", + L"Выделите наемников", L"Курсор на бойцов", L"Курсор на дверь", L"Мерцание вещей", @@ -6630,8 +6630,8 @@ STR16 zOptionsScreenHelpText[] = //Use the metric system L"Если включено, то используется метрическая система мер,\nиначе будет британская.", - //Merc Lighted movement - L"При ходьбе карта подсвечивается вокруг бойца.\nОтключите эту настройку для повышения\nпроизводительности системы (|G).", + //Highlight Mercs + L"При включении выделяет наемника (не виден врагам).\nПереключиться в игре с помощью (|G)", //Smart cursor L"Если включено, то перемещение курсора возле наёмника\nавтоматически выбирает его.", From 4067559ea160ca573e6493d4d4d1af458ea9c478 Mon Sep 17 00:00:00 2001 From: Marco Antonio Jaguaribe Costa Date: Tue, 17 Jan 2023 21:07:57 -0300 Subject: [PATCH 3/3] Make 'Merc Highlights' default to false "Wtf why am I glowing?" well your problems are over --- GameSettings.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/GameSettings.cpp b/GameSettings.cpp index 99b957ac6..c56d31095 100644 --- a/GameSettings.cpp +++ b/GameSettings.cpp @@ -284,7 +284,7 @@ BOOLEAN LoadGameSettings() gGameSettings.fOptions[TOPTION_RTCONFIRM] = iniReader.ReadBoolean("JA2 Game Settings","TOPTION_RTCONFIRM" , FALSE ); gGameSettings.fOptions[TOPTION_SLEEPWAKE_NOTIFICATION] = iniReader.ReadBoolean("JA2 Game Settings","TOPTION_SLEEPWAKE_NOTIFICATION" , TRUE ); gGameSettings.fOptions[TOPTION_USE_METRIC_SYSTEM] = iniReader.ReadBoolean("JA2 Game Settings","TOPTION_USE_METRIC_SYSTEM" , TRUE ); - gGameSettings.fOptions[TOPTION_MERC_CASTS_LIGHT] = iniReader.ReadBoolean("JA2 Game Settings", "TOPTION_MERC_CASTS_LIGHT", TRUE); + gGameSettings.fOptions[TOPTION_MERC_CASTS_LIGHT] = iniReader.ReadBoolean("JA2 Game Settings", "TOPTION_MERC_CASTS_LIGHT", FALSE); gGameSettings.fOptions[TOPTION_SMART_CURSOR] = iniReader.ReadBoolean("JA2 Game Settings","TOPTION_SMART_CURSOR" , FALSE ); gGameSettings.fOptions[TOPTION_SNAP_CURSOR_TO_DOOR] = iniReader.ReadBoolean("JA2 Game Settings","TOPTION_SNAP_CURSOR_TO_DOOR" , TRUE ); gGameSettings.fOptions[TOPTION_GLOW_ITEMS] = iniReader.ReadBoolean("JA2 Game Settings","TOPTION_GLOW_ITEMS" , TRUE ); @@ -775,7 +775,7 @@ void InitGameSettings() gGameSettings.fOptions[ TOPTION_RTCONFIRM ] = FALSE; gGameSettings.fOptions[ TOPTION_SLEEPWAKE_NOTIFICATION ] = TRUE; gGameSettings.fOptions[ TOPTION_USE_METRIC_SYSTEM ] = TRUE; - gGameSettings.fOptions[TOPTION_MERC_CASTS_LIGHT] = TRUE; + gGameSettings.fOptions[TOPTION_MERC_CASTS_LIGHT] = FALSE; gGameSettings.fOptions[ TOPTION_SMART_CURSOR ] = FALSE; gGameSettings.fOptions[ TOPTION_SNAP_CURSOR_TO_DOOR ] = TRUE; gGameSettings.fOptions[ TOPTION_GLOW_ITEMS ] = TRUE;