summaryrefslogtreecommitdiff
path: root/src/gui/interface
diff options
context:
space:
mode:
authorSimon Robertshaw <simon@hardwired.org.uk>2013-07-28 09:30:45 (GMT)
committer Simon Robertshaw <simon@hardwired.org.uk>2013-07-28 09:30:45 (GMT)
commit387424e0072d215e9ee40235206e1065745a69d4 (patch)
tree4ca530339420dff799ac94e184108ace6d71f185 /src/gui/interface
parent8cfead7d5a89e0b1ef5db97d5c4ee85b2526ab37 (diff)
parenta328fc519e4b2eec15f6a0b81f39bad78bf4f82e (diff)
downloadpowder-387424e0072d215e9ee40235206e1065745a69d4.zip
powder-387424e0072d215e9ee40235206e1065745a69d4.tar.gz
Merge branch 'master' of github.com:FacialTurd/The-Powder-Toy
Diffstat (limited to 'src/gui/interface')
-rw-r--r--src/gui/interface/Keys.h15
1 files changed, 9 insertions, 6 deletions
diff --git a/src/gui/interface/Keys.h b/src/gui/interface/Keys.h
index 424dd86..c42a894 100644
--- a/src/gui/interface/Keys.h
+++ b/src/gui/interface/Keys.h
@@ -14,9 +14,12 @@
#define KEY_ENTER SDLK_KP_ENTER
#define KEY_ESCAPE SDLK_ESCAPE
-#define KEY_CTRL SDLK_LCTRL
-#define KEY_ALT SDLK_LALT
-#define KEY_SHIFT SDLK_LSHIFT
+#define KEY_LCTRL SDLK_LCTRL
+#define KEY_LALT SDLK_LALT
+#define KEY_LSHIFT SDLK_LSHIFT
+#define KEY_RCTRL SDLK_RCTRL
+#define KEY_RALT SDLK_RALT
+#define KEY_RSHIFT SDLK_RSHIFT
#define KEY_MOD_NONE KMOD_NONE
#define KEY_MOD_LSHIFT KMOD_LSHIFT
@@ -32,9 +35,9 @@
#define KEY_MOD_MODE KMOD_MODE
#define KEY_MOD_RESERVED KMOD_RESERVED
-#define KEY_MOD_CONTROL KEY_MOD_RCONTROL | KEY_MOD_LCONTROL
-#define KEY_MOD_ALT KEY_MOD_RALT | KEY_MOD_LALT
-#define KEY_MOD_SHIFT KEY_MOD_RSHIFT | KEY_MOD_LSHIFT
+#define KEY_MOD_CONTROL (KEY_MOD_RCONTROL | KEY_MOD_LCONTROL)
+#define KEY_MOD_ALT (KEY_MOD_RALT | KEY_MOD_LALT)
+#define KEY_MOD_SHIFT (KEY_MOD_RSHIFT | KEY_MOD_LSHIFT)
#define KEY_a SDLK_a
#define KEY_d SDLK_d