From 04e0d0d5ad4b139ff81dbc9f39b7072a4c2c9a05 Mon Sep 17 00:00:00 2001
From: Simon Robertshaw <simon@hardwired.org.uk>
Date: Fri, 7 Sep 2012 01:05:36 +0100
Subject: [PATCH] Hidden elements in element search

---
 src/game/GameController.cpp | 2 ++
 src/game/GameModel.cpp      | 5 +++++
 src/game/GameModel.h        | 1 +
 3 files changed, 8 insertions(+)

diff --git a/src/game/GameController.cpp b/src/game/GameController.cpp
index 59e1e3423..a507b403c 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 7f050bc01..eca34a296 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 577af9ac4..10b4b1cc7 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);