diff options
| author | jacob1 <jfu614@gmail.com> | 2013-07-18 22:54:09 (GMT) |
|---|---|---|
| committer | jacob1 <jfu614@gmail.com> | 2013-07-18 22:54:09 (GMT) |
| commit | da7d107f60f2e07ac6d859dbc562473ddaf321fe (patch) | |
| tree | 3670b0f757cd5f1c181108406402b08aecaa46ba /src/gui | |
| parent | 40285e107a998aafaa6c88ee7ca650191ae5b400 (diff) | |
| download | powder-da7d107f60f2e07ac6d859dbc562473ddaf321fe.zip powder-da7d107f60f2e07ac6d859dbc562473ddaf321fe.tar.gz | |
remove specific delete for walls, doesn't work very well and it conflicts with specific delete for elements
Also prevent wall replace mode, could never do anything because walls already replace everything
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/game/GameView.cpp | 3 | ||||
| -rw-r--r-- | src/gui/game/Tool.cpp | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/gui/game/GameView.cpp b/src/gui/game/GameView.cpp index 4abceac..f1b0450 100644 --- a/src/gui/game/GameView.cpp +++ b/src/gui/game/GameView.cpp @@ -519,7 +519,8 @@ public: { ToolButton *sender = (ToolButton*)sender_; if (v->CtrlBehaviour() && v->AltBehaviour() && !v->ShiftBehaviour()) - sender->SetSelectionState(3); + if (tool->GetIdentifier().find("DEFAULT_PT_") != tool->GetIdentifier().npos) + sender->SetSelectionState(3); if(sender->GetSelectionState() >= 0 && sender->GetSelectionState() <= 3) v->c->SetActiveTool(sender->GetSelectionState(), tool); } diff --git a/src/gui/game/Tool.cpp b/src/gui/game/Tool.cpp index fb3f7ed..b0def6c 100644 --- a/src/gui/game/Tool.cpp +++ b/src/gui/game/Tool.cpp @@ -87,7 +87,7 @@ void WallTool::DrawLine(Simulation * sim, Brush * brush, ui::Point position1, ui newFanVelX *= strength; float newFanVelY = (position2.Y-position1.Y)*0.005f; newFanVelY *= strength; - sim->FloodWalls(position1.X, position1.Y, WL_FLOODHELPER, WL_FAN, 0); + sim->FloodWalls(position1.X, position1.Y, WL_FLOODHELPER, WL_FAN); for (int j = 0; j < YRES/CELL; j++) for (int i = 0; i < XRES/CELL; i++) if (sim->bmap[j][i] == WL_FLOODHELPER) |