Skip to content

Commit cc59e2b

Browse files
committed
remove all erronous mentions of ctrl+* inputs and remap some missed stuff
1 parent d5555a1 commit cc59e2b

File tree

3 files changed

+21
-21
lines changed

3 files changed

+21
-21
lines changed

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
8181

8282
- The `LimbPath` property `NormalTravelSpeed` has been renamed to just `TravelSpeed`.
8383

84-
- 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.
84+
- 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 crouching inputs.
8585

8686
</details>
8787

Source/Managers/ConsoleMan.cpp

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -222,36 +222,36 @@ void ConsoleMan::ShowShortcuts() {
222222

223223
PrintString(
224224
"\n--- SHORTCUTS ---\n"
225-
"CTRL + ~ - Console in read-only mode without input capture\n"
226-
"CTRL + DOWN / UP - Increase/decrease console size (Only while console is open)\n"
227-
"CTRL + S - Make continuous screenshots while the keys are held\n"
228-
"CTRL + W - Make a screenshot of the entire level\n"
225+
"RALT + ~ - Console in read-only mode without input capture\n"
226+
"RALT + DOWN / UP - Increase/decrease console size (Only while console is open)\n"
227+
"RALT + S - Make continuous screenshots while the keys are held\n"
228+
"RALT + W - Make a screenshot of the entire level\n"
229229
"ALT + W - Make a miniature preview image of the entire level\n"
230-
"CTRL + P - Show performance stats\n"
230+
"RALT + P - Show performance stats\n"
231231
"ALT + P - Show advanced performance stats (Only while performance stats are visible)\n"
232-
"CTRL + R - Reset activity\n"
233-
"CTRL + M - Switch display mode: Draw -> Material -> MO\n"
234-
"CTRL + O - Toggle one sim update per frame\n"
232+
"RALT + R - Reset activity\n"
233+
"RALT + M - Switch display mode: Draw -> Material -> MO\n"
234+
"RALT + O - Toggle one sim update per frame\n"
235235
"SHIFT + ESC - Skip pause menu when pausing activity (straight to scenario/conquest menu)\n"
236236
"----------------\n"
237237
"F2 - Reload all Lua scripts\n"
238238
"ALT + F2 - Reload all sprites\n"
239-
"CTRL + F2 - Quick reload Entity preset previously reloaded with PresetMan:ReloadEntityPreset\n"
239+
"RALT + F2 - Quick reload Entity preset previously reloaded with PresetMan:ReloadEntityPreset\n"
240240
"F3 - Save console log\n"
241241
"F4 - Save console user input log\n"
242242
"F5 - Quick save\n"
243243
"F9 - Load latest quick-save\n"
244-
"CTRL + F9 - Load latest auto-save\n"
244+
"RALT + F9 - Load latest auto-save\n"
245245
"F10 - Clear Console log\n"
246246
"F12 - Make a single screenshot");
247247
}
248248

249249
void ConsoleMan::Update() {
250-
if (g_UInputMan.FlagCtrlState() && g_UInputMan.KeyPressed(SDL_SCANCODE_GRAVE)) {
250+
if (g_UInputMan.FlagRAltState() && g_UInputMan.KeyPressed(SDL_SCANCODE_GRAVE)) {
251251
SetReadOnly();
252252
}
253253

254-
if (!g_UInputMan.FlagShiftState() && (!g_UInputMan.FlagCtrlState() && (g_UInputMan.KeyPressed(SDL_SCANCODE_GRAVE) || (IsEnabled() && g_UInputMan.KeyPressed(SDL_SCANCODE_ESCAPE))))) {
254+
if (!g_UInputMan.FlagShiftState() && (!g_UInputMan.FlagRAltState() && (g_UInputMan.KeyPressed(SDL_SCANCODE_GRAVE) || (IsEnabled() && g_UInputMan.KeyPressed(SDL_SCANCODE_ESCAPE))))) {
255255
if (IsEnabled()) {
256256
if (!m_ReadOnly) {
257257
m_InputTextBox->SetEnabled(false);
@@ -288,17 +288,17 @@ void ConsoleMan::Update() {
288288

289289
m_GUIControlManager->Update();
290290

291-
if (g_UInputMan.FlagCtrlState() && g_UInputMan.KeyPressed(SDLK_DOWN)) {
291+
if (g_UInputMan.FlagRAltState() && g_UInputMan.KeyPressed(SDLK_DOWN)) {
292292
SetConsoleScreenSize(m_ConsoleScreenRatio + 0.05F);
293-
} else if (g_UInputMan.FlagCtrlState() && g_UInputMan.KeyPressed(SDLK_UP)) {
293+
} else if (g_UInputMan.FlagRAltState() && g_UInputMan.KeyPressed(SDLK_UP)) {
294294
SetConsoleScreenSize(m_ConsoleScreenRatio - 0.05F);
295295
}
296296

297297
if (!m_ReadOnly) {
298298
m_InputTextBox->SetEnabled(true);
299299
m_InputTextBox->SetFocus();
300300

301-
if (!m_InputLog.empty() && !g_UInputMan.FlagCtrlState()) {
301+
if (!m_InputLog.empty() && !g_UInputMan.FlagRAltState()) {
302302
if (g_UInputMan.KeyPressed(SDLK_UP)) {
303303
LoadLoggedInput(false);
304304
} else if (g_UInputMan.KeyPressed(SDLK_DOWN)) {

Source/Managers/UInputMan.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -864,7 +864,7 @@ void UInputMan::HandleSpecialInput() {
864864
}
865865
// Ctrl+R or Back button for controllers to reset activity.
866866
if (!g_MetaMan.GameInProgress() && !g_ActivityMan.ActivitySetToRestart()) {
867-
g_ActivityMan.SetRestartActivity((FlagRCtrlState() && KeyPressed(SDLK_r)) || AnyBackPress());
867+
g_ActivityMan.SetRestartActivity((FlagRAltState() && KeyPressed(SDLK_r)) || AnyBackPress());
868868
}
869869
if (g_ActivityMan.ActivitySetToRestart()) {
870870
return;
@@ -876,16 +876,16 @@ void UInputMan::HandleSpecialInput() {
876876
}
877877

878878
if (FlagRAltState()) {
879-
// Ctrl+S to save continuous ScreenDumps
879+
// RAlt+S to save continuous ScreenDumps
880880
if (KeyHeld(SDLK_s)) {
881881
g_FrameMan.SaveScreenToPNG("ScreenDump");
882-
// Ctrl+W to save a WorldDump
882+
// RAlt+W to save a WorldDump
883883
} else if (KeyPressed(SDLK_w)) {
884884
g_FrameMan.SaveWorldToPNG("WorldDump");
885-
// Ctrl+M to cycle draw modes
885+
// RAlt+M to cycle draw modes
886886
} else if (KeyPressed(SDLK_m)) {
887887
g_SceneMan.SetLayerDrawMode((g_SceneMan.GetLayerDrawMode() + 1) % 3);
888-
// Ctrl+P to toggle performance stats
888+
// RAlt+P to toggle performance stats
889889
} else if (KeyPressed(SDLK_p)) {
890890
g_PerformanceMan.ShowPerformanceStats(!g_PerformanceMan.IsShowingPerformanceStats());
891891
} else if (KeyPressed(SDLK_F2)) {

0 commit comments

Comments
 (0)