summaryrefslogtreecommitdiff
path: root/src/game/GameView.h
diff options
context:
space:
mode:
authorSimon Robertshaw <simon@hardwired.org.uk>2012-08-24 16:34:36 (GMT)
committer Simon Robertshaw <simon@hardwired.org.uk>2012-08-24 16:34:36 (GMT)
commitbeb0e8084932c437d68bbbf7efb82734e5d01ef1 (patch)
tree8c13f2bf46c30577ca3e01337566b25dfb0d17ef /src/game/GameView.h
parent7ead5edd5f2f6ed8e3b62adcc25d897ddba5fb3c (diff)
downloadpowder-beb0e8084932c437d68bbbf7efb82734e5d01ef1.zip
powder-beb0e8084932c437d68bbbf7efb82734e5d01ef1.tar.gz
Prevent key overlap for Stickman movement and Gravity/Debug/Stamp actions, fixes #81
Diffstat (limited to 'src/game/GameView.h')
-rw-r--r--src/game/GameView.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/game/GameView.h b/src/game/GameView.h
index c449ba2..02dadc8 100644
--- a/src/game/GameView.h
+++ b/src/game/GameView.h
@@ -138,6 +138,10 @@ public:
void SetSample(SimulationSample sample);
bool CtrlBehaviour(){ return ctrlBehaviour; }
bool ShiftBehaviour(){ return shiftBehaviour; }
+ void ExitPrompt();
+ void ToggleDebug();
+ SelectMode GetSelectMode() { return selectMode; }
+ void BeginStampSelection();
void AttachController(GameController * _c){ c = _c; }
void NotifyRendererChanged(GameModel * sender);
@@ -160,7 +164,6 @@ public:
void NotifyQuickOptionsChanged(GameModel * sender);
void NotifyLastToolChanged(GameModel * sender);
- void ExitPrompt();
virtual void ToolTip(ui::Component * sender, ui::Point mousePosition, std::string toolTip);