matthew/The-Powder-Toy
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Hidden elements in element search

Browse Source
This commit is contained in:
Simon Robertshaw 2012-09-07 01:05:36 +01:00
parent 5a91b83875
commit 04e0d0d5ad
3 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/game/GameController.cpp
View File

@ -973,6 +973,8 @@ void GameController::OpenElementSearch()
continue; continue;
toolList.insert(toolList.end(), menuToolList.begin(), menuToolList.end()); toolList.insert(toolList.end(), menuToolList.begin(), menuToolList.end());
} }
vector<Tool*> hiddenTools = gameModel->GetUnlistedTools();
toolList.insert(toolList.end(), hiddenTools.begin(), hiddenTools.end());
new ElementSearchActivity(gameModel, toolList); new ElementSearchActivity(gameModel, toolList);
} }

5
src/game/GameModel.cpp
View File

@ -426,6 +426,11 @@ void GameModel::SetActiveMenu(Menu * menu)
} }
} }
vector<Tool*> GameModel::GetUnlistedTools()
{
return extraElementTools;
}
vector<Tool*> GameModel::GetToolList() vector<Tool*> GameModel::GetToolList()
{ {
return toolList; return toolList;

1
src/game/GameModel.h
View File

@ -151,6 +151,7 @@ public:
void SetDecoration(bool decorationState); void SetDecoration(bool decorationState);
void ClearSimulation(); void ClearSimulation();
vector<Menu*> GetMenuList(); vector<Menu*> GetMenuList();
vector<Tool*> GetUnlistedTools();
vector<Tool*> GetToolList(); vector<Tool*> GetToolList();
vector<QuickOption*> GetQuickOptions(); vector<QuickOption*> GetQuickOptions();
void SetActiveMenu(Menu * menu); void SetActiveMenu(Menu * menu);