use right alt, not ctrl (right ctrl is used for crouching with arrow keys)

Author: Causeless

CHANGELOG.md

@@ -51,7 +51,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - New `AEmitter` and `PEmitter` INI and Lua (R/W) property `PlayBurstSound` which denotes whether the BurstSound should play when appropriate. This should not be confused for a trigger - it's just a enable/disable toggle to avoid having to remove and add BurstSound altogether.
 
 - Allow lua scripts to use LuaJIT's BitOp module (see https://bitop.luajit.org/api.html)
-  
+
 </details>
 
 <details><summary><b>Changed</b></summary>
@@ -81,7 +81,7 @@ 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.
+- All ctrl+* special inputs functionality (i.e restarting activity, world dumps, showing performance stats) are now mapped to right alt, to not interfere with default couching inputs.
 
 </details>
 

Source/Lua/LuaBindingsManagers.cpp

@@ -401,9 +401,14 @@ LuaBindingRegisterFunctionDefinitionForType(ManagerLuaBindings, TimerMan) {
 LuaBindingRegisterFunctionDefinitionForType(ManagerLuaBindings, UInputMan) {
 	return luabind::class_<UInputMan>("UInputManager")
 
+	    .property("FlagLAltState", &UInputMan::FlagLAltState)
+	    .property("FlagRAltState", &UInputMan::FlagRAltState)
 	    .property("FlagAltState", &UInputMan::FlagAltState)
-	    .property("FlagCtrlState", &UInputMan::FlagCtrlState)
+	    .property("FlagLCtrlState", &UInputMan::FlagLCtrlState)
 	    .property("FlagRCtrlState", &UInputMan::FlagRCtrlState)
+	    .property("FlagCtrlState", &UInputMan::FlagCtrlState)
+	    .property("FlagLShiftState", &UInputMan::FlagLShiftState)
+	    .property("FlagRShiftState", &UInputMan::FlagRShiftState)
 	    .property("FlagShiftState", &UInputMan::FlagShiftState)
 
 	    .def("GetInputDevice", &UInputMan::GetInputDevice)

Source/Managers/UInputMan.cpp

@@ -875,7 +875,7 @@ void UInputMan::HandleSpecialInput() {
 		return;
 	}
 
-	if (FlagRCtrlState() && !FlagAltState()) {
+	if (FlagRAltState()) {
 		// 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 (!FlagRCtrlState() && FlagAltState()) {
+	} else if (FlagLAltState()) {
 		if (KeyPressed(SDLK_F2)) {
 			ContentFile::ReloadAllBitmaps();
 			// Alt+Enter to switch resolution multiplier

Source/Managers/UInputMan.h

@@ -159,21 +159,41 @@ namespace RTE {
 		/// @return Whether any back buttons have been pressed at all since last frame.
 		bool AnyBackPress();
 
+		/// Gets the state of the Left Ctrl key.
+		/// @return The state of the Left Ctrl key.
+		bool FlagLCtrlState() const { return (SDL_GetModState() & KMOD_LCTRL) > 0; }
+
 		/// 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; }
+		bool FlagRCtrlState() const { return (SDL_GetModState() & KMOD_RCTRL) > 0; }
 
-		/// 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; }
+		/// Gets the state of either Ctrl key.
+		/// @return The state of either Ctrl key.
+		bool FlagCtrlState() const { return (SDL_GetModState() & KMOD_CTRL) > 0; }
 
-		/// Gets the state of the Alt key.
+		/// Gets the state of the Left Alt key.
 		/// @return The state of the Alt key.
-		bool FlagAltState() const { return ((SDL_GetModState() & KMOD_ALT) > 0) ? true : false; }
+		bool FlagLAltState() const { return (SDL_GetModState() & KMOD_LALT) > 0; }
+
+		/// Gets the state of the Right Alt key.
+		/// @return The state of the Right Alt key.
+		bool FlagRAltState() const { return (SDL_GetModState() & KMOD_RALT) > 0; }
+
+		/// Gets the state of either Alt key.
+		/// @return The state of either Alt key.
+		bool FlagAltState() const { return (SDL_GetModState() & KMOD_ALT) > 0; }
+
+		/// Gets the state of the Left Shift key.
+		/// @return The state of the Left Shift key.
+		bool FlagLShiftState() const { return (SDL_GetModState() & KMOD_LSHIFT) > 0; }
+
+		/// Gets the state of the Right Shift key.
+		/// @return The state of the Right Shift key.
+		bool FlagRShiftState() const { return (SDL_GetModState() & KMOD_RSHIFT) > 0; }
 
-		/// Gets the state of the Shift key.
-		/// @return The state of the Shift key.
-		bool FlagShiftState() const { return ((SDL_GetModState() & KMOD_SHIFT) > 0) ? true : false; }
+		/// Gets the state of either Shift key.
+		/// @return The state of either Shift key.
+		bool FlagShiftState() const { return (SDL_GetModState() & KMOD_SHIFT) > 0; }
 #pragma endregion
 
 #pragma region Keyboard Handling