summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSimon Robertshaw <simon@hardwired.org.uk>2012-09-07 00:05:36 (GMT)
committer Simon Robertshaw <simon@hardwired.org.uk>2012-09-07 00:05:36 (GMT)
commit04e0d0d5ad4b139ff81dbc9f39b7072a4c2c9a05 (patch)
tree16dbabc05cf94523bddc887429aa09d5b4abee76 /src
parent5a91b83875c8a25e36ecdcddb6c79de61125da39 (diff)
downloadpowder-04e0d0d5ad4b139ff81dbc9f39b7072a4c2c9a05.zip
powder-04e0d0d5ad4b139ff81dbc9f39b7072a4c2c9a05.tar.gz
Hidden elements in element search
Diffstat (limited to 'src')
-rw-r--r--src/game/GameController.cpp2
-rw-r--r--src/game/GameModel.cpp5
-rw-r--r--src/game/GameModel.h1
3 files changed, 8 insertions, 0 deletions
diff --git a/src/game/GameController.cpp b/src/game/GameController.cpp
index 59e1e34..a507b40 100644
--- a/src/game/GameController.cpp
+++ b/src/game/GameController.cpp
@@ -973,6 +973,8 @@ void GameController::OpenElementSearch()
continue;
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);
}
diff --git a/src/game/GameModel.cpp b/src/game/GameModel.cpp
index 7f050bc..eca34a2 100644
--- a/src/game/GameModel.cpp
+++ b/src/game/GameModel.cpp
@@ -426,6 +426,11 @@ void GameModel::SetActiveMenu(Menu * menu)
}
}
+vector<Tool*> GameModel::GetUnlistedTools()
+{
+ return extraElementTools;
+}
+
vector<Tool*> GameModel::GetToolList()
{
return toolList;
diff --git a/src/game/GameModel.h b/src/game/GameModel.h
index 577af9a..10b4b1c 100644
--- a/src/game/GameModel.h
+++ b/src/game/GameModel.h
@@ -151,6 +151,7 @@ public:
void SetDecoration(bool decorationState);
void ClearSimulation();
vector<Menu*> GetMenuList();
+ vector<Tool*> GetUnlistedTools();
vector<Tool*> GetToolList();
vector<QuickOption*> GetQuickOptions();
void SetActiveMenu(Menu * menu);