matthew/The-Powder-Toy
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix some more brush bugs, remove alt-sample brush

Browse Source
This commit is contained in:
jacob1 2013-02-10 14:27:49 -05:00
parent 897d250eb5
commit 4e918ab76d
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/game/GameView.cpp
View File

@ -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) 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; drawMode = DrawPoints;
else else
drawModeReset = true; drawModeReset = true;
@ -1818,11 +1824,11 @@ void GameView::OnDraw()
} }
activeBrush->RenderLine(ren, c->PointTranslate(initialDrawPoint), finalCurrentMouse); activeBrush->RenderLine(ren, c->PointTranslate(initialDrawPoint), finalCurrentMouse);
} }
else if(drawMode==DrawFill || altBehaviour) else if(drawMode==DrawFill)// || altBehaviour)
{ {
activeBrush->RenderFill(ren, finalCurrentMouse); activeBrush->RenderFill(ren, finalCurrentMouse);
} }
if ((drawMode == DrawPoints || drawMode==DrawLine || (drawMode == DrawRect && !isMouseDown)) && !altBehaviour) if(drawMode == DrawPoints || drawMode==DrawLine || (drawMode == DrawRect && !isMouseDown))
{ {
if(wallBrush) if(wallBrush)
{ {