Mapped special inputs to right control instead of both left and right control

Author: Causeless

CHANGELOG.md

@@ -81,6 +81,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 - The `LimbPath` property `NormalTravelSpeed` has been renamed to just `TravelSpeed`.
 
+- All ctrl+* special inputs functionality (i.e restarting activity, world dumps, showing performance stats) are now mapped to right ctrl, to not interfere with default couching input.
+
 </details>
 
 <details><summary><b>Fixed</b></summary>

Source/Lua/LuaBindingsManagers.cpp

@@ -403,6 +403,7 @@ LuaBindingRegisterFunctionDefinitionForType(ManagerLuaBindings, UInputMan) {
 
 	    .property("FlagAltState", &UInputMan::FlagAltState)
 	    .property("FlagCtrlState", &UInputMan::FlagCtrlState)
+	    .property("FlagRCtrlState", &UInputMan::FlagRCtrlState)
 	    .property("FlagShiftState", &UInputMan::FlagShiftState)
 
 	    .def("GetInputDevice", &UInputMan::GetInputDevice)

Source/Managers/FrameMan.cpp

@@ -899,7 +899,7 @@ void FrameMan::Draw() {
 			blit(m_NetworkBackBufferFinal8[m_NetworkFrameReady][0].get(), m_BackBuffer8.get(), 0, 0, 0, 0, m_BackBuffer8->w, m_BackBuffer8->h);
 			masked_blit(m_NetworkBackBufferFinalGUI8[m_NetworkFrameReady][0].get(), m_BackBuffer8.get(), 0, 0, 0, 0, m_BackBuffer8->w, m_BackBuffer8->h);
 
-			if (g_UInputMan.FlagAltState() || g_UInputMan.FlagCtrlState() || g_UInputMan.FlagShiftState()) {
+			if (g_UInputMan.FlagAltState() || g_UInputMan.FlagRCtrlState()) {
 				g_PerformanceMan.DrawCurrentPing();
 			}
 

Source/Managers/UInputMan.cpp

@@ -864,7 +864,7 @@ void UInputMan::HandleSpecialInput() {
 		}
 		// Ctrl+R or Back button for controllers to reset activity.
 		if (!g_MetaMan.GameInProgress() && !g_ActivityMan.ActivitySetToRestart()) {
-			g_ActivityMan.SetRestartActivity((FlagCtrlState() && KeyPressed(SDLK_r)) || AnyBackPress());
+			g_ActivityMan.SetRestartActivity((FlagRCtrlState() && KeyPressed(SDLK_r)) || AnyBackPress());
 		}
 		if (g_ActivityMan.ActivitySetToRestart()) {
 			return;
@@ -875,7 +875,7 @@ void UInputMan::HandleSpecialInput() {
 		return;
 	}
 
-	if (FlagCtrlState() && !FlagAltState()) {
+	if (FlagRCtrlState() && !FlagAltState()) {
 		// Ctrl+S to save continuous ScreenDumps
 		if (KeyHeld(SDLK_s)) {
 			g_FrameMan.SaveScreenToPNG("ScreenDump");
@@ -899,7 +899,7 @@ void UInputMan::HandleSpecialInput() {
 				g_TimerMan.SetDeltaTimeSecs(c_DefaultDeltaTimeS);
 			}
 		}
-	} else if (!FlagCtrlState() && FlagAltState()) {
+	} else if (!FlagRCtrlState() && FlagAltState()) {
 		if (KeyPressed(SDLK_F2)) {
 			ContentFile::ReloadAllBitmaps();
 			// Alt+Enter to switch resolution multiplier

Source/Managers/UInputMan.h

@@ -159,6 +159,10 @@ namespace RTE {
 		/// @return Whether any back buttons have been pressed at all since last frame.
 		bool AnyBackPress();
 
+		/// Gets the state of the Right Ctrl key.
+		/// @return The state of the Right Ctrl key.
+		bool FlagRCtrlState() const { return ((SDL_GetModState() & KMOD_RCTRL) > 0) ? true : false; }
+
 		/// Gets the state of the Ctrl key.
 		/// @return The state of the Ctrl key.
 		bool FlagCtrlState() const { return ((SDL_GetModState() & KMOD_CTRL) > 0) ? true : false; }