Prevent key overlap for Stickman movement and Gravity/Debug/Stamp actions, fixes #81

1 files changed, 13 insertions, 12 deletions

diff --git a/src/game/GameView.cpp b/src/game/GameView.cpp
index 26477e0..4a9bd93 100644
--- a/src/game/GameView.cpp
+++ b/src/game/GameView.cpp
@@ -1179,6 +1179,19 @@ void GameView::OnMouseWheel(int x, int y, int d)
 	}
 }
 
+void GameView::ToggleDebug()
+{
+	showDebug = !showDebug;
+}
+
+void GameView::BeginStampSelection()
+{
+	selectMode = SelectStamp;
+	selectPoint1 = ui::Point(-1, -1);
+	infoTip = "\x0F\xEF\xEF\x10Select an area to create a stamp";
+	infoTipPresence = 120;
+}
+
 void GameView::OnKeyPress(int key, Uint16 character, bool shift, bool ctrl, bool alt)
 {
 	if(colourRValue->IsFocused() || colourGValue->IsFocused() || colourBValue->IsFocused() || colourAValue->IsFocused())
@@ -1300,9 +1313,6 @@ void GameView::OnKeyPress(int key, Uint16 character, bool shift, bool ctrl, bool
 		else
 			c->AdjustGridSize(1);
 		break;
-	case 'd':
-		showDebug = !showDebug;
-		break;
 	case KEY_F1:
 		if(!introText)
 			introText = 8047;
@@ -1324,15 +1334,6 @@ void GameView::OnKeyPress(int key, Uint16 character, bool shift, bool ctrl, bool
 		if(ctrl)
 			c->SetDecoration();
 		break;
-	case 's':
-		selectMode = SelectStamp;
-		selectPoint1 = ui::Point(-1, -1);
-		infoTip = "\x0F\xEF\xEF\x10Select an area to create a stamp";
-		infoTipPresence = 120;
-		break;
-	case 'w':
-		c->SwitchGravity();
-		break;
 	case 'y':
 		c->SwitchAir();
 		break;