diff options
| author | Simon Robertshaw <simon@hardwired.org.uk> | 2012-01-24 20:19:19 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2012-01-24 20:19:19 (GMT) |
| commit | 97b35bc47059315d4138c8e0827842d2c03de152 (patch) | |
| tree | feaf7a8c018982ba9d7ca1b8e6e15294abfdfc84 /src/game/GameModel.cpp | |
| parent | 04488081d3fa0cd3dfb2939e5d902bc894df150d (diff) | |
| download | powder-97b35bc47059315d4138c8e0827842d2c03de152.zip powder-97b35bc47059315d4138c8e0827842d2c03de152.tar.gz | |
Various
Diffstat (limited to 'src/game/GameModel.cpp')
| -rw-r--r-- | src/game/GameModel.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/game/GameModel.cpp b/src/game/GameModel.cpp index 91b1c8d..8f16f49 100644 --- a/src/game/GameModel.cpp +++ b/src/game/GameModel.cpp @@ -19,12 +19,12 @@ GameModel::GameModel(): menuList.clear(); for(int i = 0; i < 12; i++) { - menuList.push_back(new Menu('q', "Simon")); + menuList.push_back(new Menu((const char)sim->msections[i].icon[0], sim->msections[i].name)); } //Build menus from Simulation elements for(int i = 0; i < PT_NUM; i++) { - if(sim->ptypes[i].menusection < 12) + if(sim->ptypes[i].menusection < 12 && sim->ptypes[i].enabled && sim->ptypes[i].menu) { 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); |