summaryrefslogtreecommitdiff
path: root/src/gui/game/GameView.cpp
diff options
context:
space:
mode:
authorjacob1 <jfu614@gmail.com>2013-06-06 15:52:33 (GMT)
committer jacob1 <jfu614@gmail.com>2013-06-06 15:52:33 (GMT)
commitb594d6825858615c835d26510a6cc9a22bc239e2 (patch)
tree96b7f95d5abd54d92f9596066cef67595917c3f9 /src/gui/game/GameView.cpp
parent2119343b6a76bdc6bda0fb62cea46f0a6b2df285 (diff)
downloadpowder-b594d6825858615c835d26510a6cc9a22bc239e2.zip
powder-b594d6825858615c835d26510a6cc9a22bc239e2.tar.gz
WIND tool creates WIND just by holding down the line tool again
Diffstat (limited to 'src/gui/game/GameView.cpp')
-rw-r--r--src/gui/game/GameView.cpp13
1 files changed, 11 insertions, 2 deletions
diff --git a/src/gui/game/GameView.cpp b/src/gui/game/GameView.cpp
index aba0d6f..ca4272c 100644
--- a/src/gui/game/GameView.cpp
+++ b/src/gui/game/GameView.cpp
@@ -183,6 +183,7 @@ GameView::GameView():
introTextMessage(introTextData),
wallBrush(false),
toolBrush(false),
+ windTool(false),
doScreenshot(false),
recording(false),
screenshotIndex(0),
@@ -622,6 +623,10 @@ void GameView::NotifyActiveToolsChanged(GameModel * sender)
{
toolButtons[i]->SetSelectionState(0); //Primary
c->ActiveToolChanged(0, tool);
+ if (tool->GetIdentifier().find("DEFAULT_UI_WIND") != tool->GetIdentifier().npos)
+ windTool = true;
+ else
+ windTool = false;
}
else if(sender->GetActiveTool(1) == tool)
{
@@ -1326,7 +1331,7 @@ void GameView::OnKeyPress(int key, Uint16 character, bool shift, bool ctrl, bool
}
else
{
- if (drawMode != DrawLine)
+ if (drawMode != DrawLine && !windTool)
isMouseDown = false;
zoomCursorFixed = false;
c->SetZoomEnabled(true);
@@ -1530,10 +1535,14 @@ void GameView::OnTick(float dt)
c->DrawPoints(toolIndex, pointQueue);
}
}
- if(drawMode == DrawFill && isMouseDown)
+ else if(drawMode == DrawFill && isMouseDown)
{
c->DrawFill(toolIndex, c->PointTranslate(currentMouse));
}
+ else if (windTool && isMouseDown && drawMode == DrawLine)
+ {
+ c->DrawLine(toolIndex, c->PointTranslate(drawPoint1), lineSnapCoords(c->PointTranslate(drawPoint1), currentMouse));
+ }
if(introText)
{
introText -= int(dt)>0?((int)dt < 5? dt:5):1;