From 98f8cf9abeebef79e8fc8929725f8456c830e908 Mon Sep 17 00:00:00 2001
From: Nat Quayle Nelson <natquaylenelson@gmail.com>
Date: Mon, 20 Jan 2025 15:12:24 -0600
Subject: [PATCH] Make Shift+directional keys do opposite

---
 rsrc/dialogs/preferences.xml | 5 +++--
 src/game/boe.actions.cpp     | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/rsrc/dialogs/preferences.xml b/rsrc/dialogs/preferences.xml
index d437e865..6da6fa15 100644
--- a/rsrc/dialogs/preferences.xml
+++ b/rsrc/dialogs/preferences.xml
@@ -44,9 +44,10 @@
 	<text name='keyshift-head' size='large' relative='pos-in pos' anchor='spd-head' top='30' left='0' width='182' height='17'>When targeting, directional keys should:</text>
 	<group name='keyshift-options'>
 		<led name='target-adjacent' relative='pos-in pos' anchor='keyshift-head' top='4' left='15'>Select adjacent tiles</led>
-		<led name='screen-shift' relative='pos pos-in' anchor='target-adjacent' top='0' left='15'>Shift the screen</led>
+		<led name='screen-shift' relative='pos pos-in' anchor='target-adjacent' top='0' left='15'>Move the screen</led>
 	</group>
-	<text name='misc-head' size='large' relative='pos-in pos' anchor='keyshift-head' top='30' left='0' width='182' height='17'>Miscellaneous:</text>
+	<text name='keyshift-note' size='large' relative='pos-in pos' anchor='keyshift-head' top='20' left='15' width='300' height='17'>(Holding Shift while using directional keys will do the opposite.)</text>
+	<text name='misc-head' size='large' relative='neg pos' anchor='keyshift-note' top='15' left='15' width='182' height='17'>Miscellaneous:</text>
 	<led name='nosound' relative='pos-in pos' anchor='misc-head' top='6' left='15'>No Sounds</led>
 	<led name='repeatdesc' relative='pos-in pos' rel-anchor='prev' top='10' left='0'>Show room descriptions more than once</led>
 	<led name='easier' relative='pos-in pos' rel-anchor='prev' top='10' left='0'>Make game easier (monsters much weaker)</led>
diff --git a/src/game/boe.actions.cpp b/src/game/boe.actions.cpp
index ff08760d..dc70c09a 100644
--- a/src/game/boe.actions.cpp
+++ b/src/game/boe.actions.cpp
@@ -1299,7 +1299,7 @@ void screen_shift(int dx, int dy, bool& need_redraw) {
 
 // If configured to move the screen with arrow keys, do it and return true
 bool handle_screen_shift(location delta, bool& need_redraw) {
-	if(scrollableModes.count(overall_mode) && get_bool_pref("DirectionalKeyScrolling", false)){
+	if(scrollableModes.count(overall_mode) && get_bool_pref("DirectionalKeyScrolling", false) != kb.isShiftPressed()){
 		screen_shift(delta.x, delta.y, need_redraw);
 		return true;
 	}