Default to not displaying the fake light around mercs

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_ALWAYS_LIGHT_UP]            = iniReader.ReadBoolean("JA2 Game Settings","TOPTION_MERC_ALWAYS_LIGHT_UP"             ,  FALSE );
+		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  );
@@ -353,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 );
@@ -572,7 +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_ALWAYS_LIGHT_UP             = " << (gGameSettings.fOptions[TOPTION_MERC_ALWAYS_LIGHT_UP]				?    "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;
@@ -633,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;
@@ -777,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_ALWAYS_LIGHT_UP ]				= FALSE;
+	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;
@@ -870,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;
 

GameSettings.h

@@ -33,7 +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_ALWAYS_LIGHT_UP,
+	TOPTION_MERC_CASTS_LIGHT,
 	TOPTION_SMART_CURSOR,
 	TOPTION_SNAP_CURSOR_TO_DOOR,
 	TOPTION_GLOW_ITEMS,
@@ -127,8 +127,6 @@ enum
 	//These options will NOT be toggable by the Player
 
 	// JA2Gold
-	TOPTION_MERC_CASTS_LIGHT,
-
 	TOPTION_HIDE_BULLETS,
 	TOPTION_TRACKING_MODE,
 

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

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 )

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"打开时，光标移动到佣兵身上时会高亮显示佣兵。",

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.",

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.",

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é.",

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.",

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.",

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.",

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автоматически выбирает его.",