Merge branch 'master' of https://github.com/luciusDXL/TheForceEngine

Author: luciusDXL

TheForceEngine/TFE_FrontEndUI/frontEndUi.cpp

@@ -1207,6 +1207,12 @@ namespace TFE_FrontEndUI
 			gameSettings->df_showSecretFoundMsg = showSecretMsg;
 		}
 
+		bool showKeysUsed = gameSettings->df_showKeyUsed;
+		if (ImGui::Checkbox("Show Key Used messages", &showKeysUsed))
+		{
+			gameSettings->df_showKeyUsed = showKeysUsed;
+		}
+
 		bool autorun = gameSettings->df_autorun;
 		if (ImGui::Checkbox("Autorun", &autorun))
 		{

TheForceEngine/TFE_Jedi/InfSystem/infSystem.cpp

@@ -23,6 +23,7 @@
 #include <TFE_System/system.h>
 #include <TFE_System/memoryPool.h>
 #include <TFE_System/math.h>
+#include <TFE_System/tfeMessage.h>
 #include <TFE_Jedi/Level/rtexture.h>
 #include <TFE_Jedi/Task/task.h>
 // TODO: This will make adding Outlaws harder, fix the abstraction.
@@ -2791,26 +2792,54 @@ namespace TFE_Jedi
 
 			// Does the player have the key?
 			KeyItem key = elev->key;
-			if (key == KEY_RED && !s_playerInfo.itemRedKey)
+			char keyBuffer[50];
+			char keyBufferWrapper[50];
+			snprintf(keyBufferWrapper, 50, "%s", TFE_System::getMessage(TFE_MSG_KEY));
+
+			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)
+				{
+					sprintf(keyBuffer, keyBufferWrapper, TFE_System::getMessage(TFE_MSG_RED));
+					TFE_DarkForces::hud_sendTextMessage(keyBuffer, 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)
+				{
+					sprintf(keyBuffer, keyBufferWrapper, TFE_System::getMessage(TFE_MSG_YELLOW));
+					TFE_DarkForces::hud_sendTextMessage(keyBuffer, 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)
+				{
+					sprintf(keyBuffer, keyBufferWrapper, TFE_System::getMessage(TFE_MSG_BLUE));
+					TFE_DarkForces::hud_sendTextMessage(keyBuffer, 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

@@ -575,6 +575,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);
 		writeKeyValue_Bool(settings, "df_showKeyColors", s_gameSettings.df_showKeyColors);
 	}
 
@@ -1237,6 +1238,10 @@ namespace TFE_Settings
 		{
 			s_gameSettings.df_autoEndMission = parseBool(value);
 		}
+		else if (strcasecmp("df_showKeyUsed", key) == 0)
+		{
+			s_gameSettings.df_showKeyUsed = parseBool(value);
+    }
 		else if (strcasecmp("df_showKeyColors", key) == 0)
 		{
 			s_gameSettings.df_showKeyColors = parseBool(value);

TheForceEngine/TFE_Settings/settings.h

@@ -228,9 +228,10 @@ struct TFE_Settings_Game
 	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_showKeyColors = false;      // Shows the door key color on the minimap
+  bool df_showKeyColors = false;      // Shows the door key color on the minimap
 	s32  df_recordFrameRate = 4;        // Recording Framerate value
 	s32  df_playbackFrameRate = 2;      // Playback Framerate value
+	bool df_showKeyUsed = true; 	    // Show a message when a key is used.
 	PitchLimit df_pitchLimit  = PITCH_VANILLA_PLUS;
 };
 

TheForceEngine/TFE_System/tfeMessage.h

@@ -23,6 +23,10 @@ enum TFE_Message
 	TFE_MSG_HARDCORE,
 	TFE_MSG_FULLBRIGHT,
 	TFE_MSG_HD,
+	TFE_MSG_RED,
+	TFE_MSG_BLUE,
+	TFE_MSG_YELLOW,
+	TFE_MSG_KEY,
 	TFE_MSG_COUNT
 };
 

TheForceEngine/UI_Text/TfeMessages.txt

@@ -11,4 +11,8 @@
 "One-Hit Kill Toggle."  // TFE_MSG_ONEHITKILL
 "Hardcore Mode Toggle." // TFE_MSG_HARDCORE
 "Full-Bright Toggle."   // TFE_MSG_FULLBRIGHT
-"HD Assets Toggle."   // TFE_MSG_HD
+"HD Assets Toggle."     // TFE_MSG_HD
+"Red"                   // TFE_MSG_RED
+"Blue"                  // TFE_MSG_BLUE
+"Yellow"                // TFE_MSG_YELLOW
+"Using the %s key"      // TFE_MSG_KEY