summaryrefslogtreecommitdiff
path: root/src/game/GameView.cpp
diff options
context:
space:
mode:
authorSimon Robertshaw <simon@hardwired.org.uk>2012-04-03 17:12:32 (GMT)
committer Simon Robertshaw <simon@hardwired.org.uk>2012-04-03 17:12:32 (GMT)
commit299c1da9ae6b79ddb6cc39477ad31fb1d2a3c566 (patch)
treea867e45707c6d819761782c90af00b0f6093cbcc /src/game/GameView.cpp
parent838a612026c821c03e663c818d4bc9fe740febd8 (diff)
downloadpowder-299c1da9ae6b79ddb6cc39477ad31fb1d2a3c566.zip
powder-299c1da9ae6b79ddb6cc39477ad31fb1d2a3c566.tar.gz
Search and stamps scolling with mouse wheel, Esc to exit
Diffstat (limited to 'src/game/GameView.cpp')
-rw-r--r--src/game/GameView.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/game/GameView.cpp b/src/game/GameView.cpp
index c7dc063..4067d5a 100644
--- a/src/game/GameView.cpp
+++ b/src/game/GameView.cpp
@@ -717,6 +717,10 @@ void GameView::OnKeyRelease(int key, Uint16 character, bool shift, bool ctrl, bo
void GameView::OnTick(float dt)
{
+ if(selectMode==PlaceStamp && !stampThumb)
+ selectMode = SelectNone;
+ if(selectMode==PlaceClipboard&& !clipboardThumb)
+ selectMode = SelectNone;
if(zoomEnabled && !zoomCursorFixed)
c->SetZoomPosition(currentMouse);
if(drawMode == DrawPoints)