diff options
| author | Simon Robertshaw <simon@hardwired.org.uk> | 2012-05-07 16:59:50 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2012-05-07 16:59:50 (GMT) |
| commit | 51b17badf4c72270bb762ea795d05d51c8b355e3 (patch) | |
| tree | b66671e0496b68114c6e91eedb58bf783d5343c0 /src/game/GameModel.cpp | |
| parent | fb111f42d00dd8a2041bae970c0913e096ac5101 (diff) | |
| download | powder-51b17badf4c72270bb762ea795d05d51c8b355e3.zip powder-51b17badf4c72270bb762ea795d05d51c8b355e3.tar.gz | |
A bit of refactoring (elements)
Diffstat (limited to 'src/game/GameModel.cpp')
| -rw-r--r-- | src/game/GameModel.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/game/GameModel.cpp b/src/game/GameModel.cpp index 4dd14ef..bb69479 100644 --- a/src/game/GameModel.cpp +++ b/src/game/GameModel.cpp @@ -71,10 +71,10 @@ GameModel::GameModel(): //Build menus from Simulation elements for(int i = 0; i < PT_NUM; i++) { - if(sim->ptypes[i].menusection < 12 && sim->ptypes[i].enabled && sim->ptypes[i].menu) + if(sim->elements[i].MenuSection < 12 && sim->elements[i].Enabled && sim->elements[i].MenuVisible) { - Tool * tempTool = new ElementTool(i, sim->ptypes[i].name, PIXR(sim->ptypes[i].pcolors), PIXG(sim->ptypes[i].pcolors), PIXB(sim->ptypes[i].pcolors)); - menuList[sim->ptypes[i].menusection]->AddTool(tempTool); + Tool * tempTool = new ElementTool(i, sim->elements[i].Name, PIXR(sim->elements[i].Colour), PIXG(sim->elements[i].Colour), PIXB(sim->elements[i].Colour)); + menuList[sim->elements[i].MenuSection]->AddTool(tempTool); } } @@ -106,8 +106,8 @@ GameModel::GameModel(): brushList.push_back(new EllipseBrush(ui::Point(4, 4))); //Set default tools - activeTools[0] = menuList[SC_POWDERS]->GetToolList()[0]; - activeTools[1] = menuList[SC_SPECIAL]->GetToolList()[0]; + //activeTools[0] = menuList[SC_POWDERS]->GetToolList()[0]; + //activeTools[1] = menuList[SC_SPECIAL]->GetToolList()[0]; //Set default menu activeMenu = menuList[SC_POWDERS]; |