diff options
| author | Simon Robertshaw <simon@hardwired.org.uk> | 2012-02-01 18:45:59 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2012-02-01 18:45:59 (GMT) |
| commit | 038da72c61ea6a251d805e2de3662f240da52b02 (patch) | |
| tree | 05170050b16f9d663ec44ae451211e686ba196ac /src/game/GameModel.cpp | |
| parent | 857b0cc1fc58f066acd59404d16ee5e566e20f00 (diff) | |
| download | powder-038da72c61ea6a251d805e2de3662f240da52b02.zip powder-038da72c61ea6a251d805e2de3662f240da52b02.tar.gz | |
Console UI, open in browser button, tab and enter shortcut for Login UI, various
Diffstat (limited to 'src/game/GameModel.cpp')
| -rw-r--r-- | src/game/GameModel.cpp | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/src/game/GameModel.cpp b/src/game/GameModel.cpp index 2ff9e0b..dcad405 100644 --- a/src/game/GameModel.cpp +++ b/src/game/GameModel.cpp @@ -41,12 +41,19 @@ GameModel::GameModel(): //sim->wtypes[i] } + //Set default brush palette brushList.push_back(new Brush(ui::Point(4, 4))); brushList.push_back(new EllipseBrush(ui::Point(4, 4))); - activeTools[0] = new ElementTool(1, "TURD", 0, 0, 0); - activeTools[1] = new ElementTool(0, "TURD", 0, 0, 0); - //activeTool[1] = new ElementTool(0, "TURD", 0, 0, 0); + //Set default tools + activeTools[0] = menuList[SC_POWDERS]->GetToolList()[0]; + activeTools[1] = menuList[SC_SPECIAL]->GetToolList()[0]; + + //Set default menu + activeMenu = menuList[SC_POWDERS]; + toolList = menuList[SC_POWDERS]->GetToolList(); + + //Load last user std::cout << Client::Ref().GetAuthUser().Username << std::endl; if(Client::Ref().GetAuthUser().ID) { |