diff options
| author | jacob1 <jfu614@gmail.com> | 2013-05-31 23:53:32 (GMT) |
|---|---|---|
| committer | jacob1 <jfu614@gmail.com> | 2013-05-31 23:53:32 (GMT) |
| commit | b16524292e2d8c640e0e4e0801d5cb4e512e4707 (patch) | |
| tree | c9b6dd2f0c6c253b8f879465ea7e9c4fe9c3d5a0 /src/gui/game/GameModel.cpp | |
| parent | 80380bbaa39735e08d42f599bcb3968b5a1a1cd4 (diff) | |
| download | powder-b16524292e2d8c640e0e4e0801d5cb4e512e4707.zip powder-b16524292e2d8c640e0e4e0801d5cb4e512e4707.tar.gz | |
fix bug where you had to start using a tool before setting it's strength
Diffstat (limited to 'src/gui/game/GameModel.cpp')
| -rw-r--r-- | src/gui/game/GameModel.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/gui/game/GameModel.cpp b/src/gui/game/GameModel.cpp index 5925079..363f275 100644 --- a/src/gui/game/GameModel.cpp +++ b/src/gui/game/GameModel.cpp @@ -304,19 +304,18 @@ void GameModel::BuildMenus() //sim->wtypes[i] } - //Add special sign and prop tools - menuList[SC_TOOL]->AddTool(new SampleTool(this)); - menuList[SC_TOOL]->AddTool(new SignTool()); - menuList[SC_TOOL]->AddTool(new PropertyTool()); - menuList[SC_TOOL]->AddTool(new WindTool(0, "WIND", "Create air movement", 64, 64, 64, "DEFAULT_UI_WIND")); - - //Build menu for simtools + //Build menu for tools for(int i = 0; i < sim->tools.size(); i++) { Tool * tempTool; tempTool = new Tool(i, sim->tools[i]->Name, sim->tools[i]->Description, PIXR(sim->tools[i]->Colour), PIXG(sim->tools[i]->Colour), PIXB(sim->tools[i]->Colour), sim->tools[i]->Identifier); menuList[SC_TOOL]->AddTool(tempTool); } + //Add special sign and prop tools + menuList[SC_TOOL]->AddTool(new WindTool(0, "WIND", "Create air movement", 64, 64, 64, "DEFAULT_UI_WIND")); + menuList[SC_TOOL]->AddTool(new PropertyTool()); + menuList[SC_TOOL]->AddTool(new SignTool()); + menuList[SC_TOOL]->AddTool(new SampleTool(this)); //Add decoration tools to menu menuList[SC_DECO]->AddTool(new DecorationTool(DecorationTool::BlendAdd, "ADD", "Colour blending: Add", 0, 0, 0, "DEFAULT_DECOR_ADD")); |