summaryrefslogtreecommitdiff
path: root/src/gui/game/GameView.cpp
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/game/GameView.cpp
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/game/GameView.cpp')
-rw-r--r--src/gui/game/GameView.cpp18
1 files changed, 12 insertions, 6 deletions
diff --git a/src/gui/game/GameView.cpp b/src/gui/game/GameView.cpp
index f1b0450..f7fa6f5 100644
--- a/src/gui/game/GameView.cpp
+++ b/src/gui/game/GameView.cpp
@@ -1279,11 +1279,13 @@ void GameView::OnKeyPress(int key, Uint16 character, bool shift, bool ctrl, bool
}
switch(key)
{
- case KEY_ALT:
+ case KEY_LALT:
+ case KEY_RALT:
drawSnap = true;
enableAltBehaviour();
break;
- case KEY_CTRL:
+ case KEY_LCTRL:
+ case KEY_RCTRL:
if(!isMouseDown)
{
if(drawModeReset)
@@ -1302,7 +1304,8 @@ void GameView::OnKeyPress(int key, Uint16 character, bool shift, bool ctrl, bool
}
enableCtrlBehaviour();
break;
- case KEY_SHIFT:
+ case KEY_LSHIFT:
+ case KEY_RSHIFT:
if(!isMouseDown)
{
if(drawModeReset)
@@ -1500,14 +1503,17 @@ void GameView::OnKeyRelease(int key, Uint16 character, bool shift, bool ctrl, bo
drawModeReset = true;
switch(key)
{
- case KEY_ALT:
+ case KEY_LALT:
+ case KEY_RALT:
drawSnap = false;
disableAltBehaviour();
break;
- case KEY_CTRL:
+ case KEY_LCTRL:
+ case KEY_RCTRL:
disableCtrlBehaviour();
break;
- case KEY_SHIFT:
+ case KEY_LSHIFT:
+ case KEY_RSHIFT:
disableShiftBehaviour();
break;
case 'z':