Door key announce

TheForceEngine/TFE_FrontEndUI/frontEndUi.cpp

@@ -1230,6 +1230,12 @@ namespace TFE_FrontEndUI
 			gameSettings->df_autoEndMission = autoEndMission;
 		}
 
+		bool showKeysUsed = gameSettings->df_showKeyUsed;
+		if (ImGui::Checkbox("Show Key Used messages when opening doors", &showKeysUsed))
+		{
+			gameSettings->df_showKeyUsed = showKeysUsed;
+		}
+
 		ImGui::Separator();
 
 		ImGui::PushFont(s_versionFont);

TheForceEngine/TFE_Jedi/InfSystem/infSystem.cpp

@@ -2786,26 +2786,50 @@ namespace TFE_Jedi
 
 			// Does the player have the key?
 			KeyItem key = elev->key;
-			if (key == KEY_RED && !s_playerInfo.itemRedKey)
+			if (key == KEY_RED)
 			{
-				// "You need the red key."
-				hud_sendTextMessage(6);
-				sound_play(s_needKeySoundId);
-				return;
+				if (TFE_Settings::getGameSettings()->df_showKeyUsed &&  s_playerInfo.itemRedKey)
+				{
+					string msg = "Using the Red Key";
+					TFE_DarkForces::hud_sendTextMessage(msg.c_str(), 1, false);
+				}
+				else if (!s_playerInfo.itemRedKey)
+				{
+					// "You need the red key."
+					hud_sendTextMessage(6);
+					sound_play(s_needKeySoundId);
+					return;
+				}
 			}
-			else if (key == KEY_YELLOW && !s_playerInfo.itemYellowKey)
+			else if (key == KEY_YELLOW)
 			{
-				// "You need the yellow key."
-				hud_sendTextMessage(7);
-				sound_play(s_needKeySoundId);
-				return;
+				if (TFE_Settings::getGameSettings()->df_showKeyUsed && s_playerInfo.itemYellowKey)
+				{
+					string msg = "Using the Yellow Key";
+					TFE_DarkForces::hud_sendTextMessage(msg.c_str(), 1, false);
+				}
+				else if (!s_playerInfo.itemYellowKey)
+				{
+					// "You need the yellow key."
+					hud_sendTextMessage(7);
+					sound_play(s_needKeySoundId);
+					return;
+				}
 			}
-			else if (key == KEY_BLUE && !s_playerInfo.itemBlueKey)
+			else if (key == KEY_BLUE)
 			{
-				// "You need the blue key."
-				hud_sendTextMessage(8);
-				sound_play(s_needKeySoundId);
-				return;
+				if (TFE_Settings::getGameSettings()->df_showKeyUsed && s_playerInfo.itemBlueKey)
+				{
+					string msg = "Using the Blue Key";
+					TFE_DarkForces::hud_sendTextMessage(msg.c_str(), 1, false);
+				}
+				else if (!s_playerInfo.itemBlueKey)	
+				{
+					// "You need the blue key."
+					hud_sendTextMessage(8);
+					sound_play(s_needKeySoundId);
+					return;
+				}
 			}
 		}
 

TheForceEngine/TFE_Settings/settings.cpp

@@ -545,6 +545,7 @@ namespace TFE_Settings
 		writeKeyValue_Bool(settings, "df_enableRecordingAll", s_gameSettings.df_enableRecordingAll);
 		writeKeyValue_Bool(settings, "df_demologging", s_gameSettings.df_demologging);
 		writeKeyValue_Bool(settings, "df_autoNextMission", s_gameSettings.df_autoEndMission);
+		writeKeyValue_Bool(settings, "df_showKeyUsed", s_gameSettings.df_showKeyUsed);
 	}
 
 	void writePerGameSettings(FileStream& settings)

TheForceEngine/TFE_Settings/settings.h

@@ -227,9 +227,10 @@ struct TFE_Settings_Game
 	bool df_enableReplay = false;       // Enable replay of gameplay.
 	bool df_showReplayCounter = false;  // Show the replay counter on the HUD.
 	bool df_demologging = false;        // Log the record/playback logging
-	bool df_autoEndMission = false;    // Automatically skip to the next mission
+	bool df_autoEndMission = false;     // Automatically skip to the next mission
 	s32  df_recordFrameRate = 4;        // Recording Framerate value
 	s32  df_playbackFrameRate = 2;      // Playback Framerate value
+	bool df_showKeyUsed = false; 	    // Show a message when a key is used.
 	PitchLimit df_pitchLimit  = PITCH_VANILLA_PLUS;
 };