diff options
| author | jacob1 <jfu614@gmail.com> | 2013-02-10 19:27:49 (GMT) |
|---|---|---|
| committer | jacob1 <jfu614@gmail.com> | 2013-02-10 19:27:49 (GMT) |
| commit | 4e918ab76d01bfdd24416d8c59acfaef0ea61db1 (patch) | |
| tree | 64afd991360fac1772342fabbeee4950b7ed4648 /src | |
| parent | 897d250eb520097da7dadb3571af3a9cf922307b (diff) | |
| download | powder-4e918ab76d01bfdd24416d8c59acfaef0ea61db1.zip powder-4e918ab76d01bfdd24416d8c59acfaef0ea61db1.tar.gz | |
fix some more brush bugs, remove alt-sample brush
Diffstat (limited to 'src')
| -rw-r--r-- | src/game/GameView.cpp | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/game/GameView.cpp b/src/game/GameView.cpp index c352b79..d1986fd 100644 --- a/src/game/GameView.cpp +++ b/src/game/GameView.cpp @@ -1434,7 +1434,13 @@ void GameView::OnKeyPress(int key, Uint16 character, bool shift, bool ctrl, bool void GameView::OnKeyRelease(int key, Uint16 character, bool shift, bool ctrl, bool alt) { - if(!isMouseDown) + if(ctrl && shift) + drawMode = DrawFill; + else if (ctrl) + drawMode = DrawRect; + else if (shift) + drawMode = DrawLine; + else if(!isMouseDown) drawMode = DrawPoints; else drawModeReset = true; @@ -1818,11 +1824,11 @@ void GameView::OnDraw() } activeBrush->RenderLine(ren, c->PointTranslate(initialDrawPoint), finalCurrentMouse); } - else if(drawMode==DrawFill || altBehaviour) + else if(drawMode==DrawFill)// || altBehaviour) { activeBrush->RenderFill(ren, finalCurrentMouse); } - if ((drawMode == DrawPoints || drawMode==DrawLine || (drawMode == DrawRect && !isMouseDown)) && !altBehaviour) + if(drawMode == DrawPoints || drawMode==DrawLine || (drawMode == DrawRect && !isMouseDown)) { if(wallBrush) { |