summaryrefslogtreecommitdiff
path: root/src/gui/elementsearch/ElementSearchActivity.h
diff options
context:
space:
mode:
authorjacob1 <jfu614@gmail.com>2013-06-08 04:23:06 (GMT)
committer jacob1 <jfu614@gmail.com>2013-06-08 04:23:06 (GMT)
commita1f9da2d0cedd4733102f1c1831cab5b51955ac2 (patch)
treeef63821023901cb401b7f97fe0a54872c4d5275d /src/gui/elementsearch/ElementSearchActivity.h
parent69961956bfae1529e6c451c57804b0d2aa93f422 (diff)
downloadpowder-a1f9da2d0cedd4733102f1c1831cab5b51955ac2.zip
powder-a1f9da2d0cedd4733102f1c1831cab5b51955ac2.tar.gz
fix tpt.selectedl not changing sometimes when using the element search or sample tool. Assume that new saves will get the auto-vote, so set that too.
Diffstat (limited to 'src/gui/elementsearch/ElementSearchActivity.h')
-rw-r--r--src/gui/elementsearch/ElementSearchActivity.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/elementsearch/ElementSearchActivity.h b/src/gui/elementsearch/ElementSearchActivity.h
index dec37e5..74bb898 100644
--- a/src/gui/elementsearch/ElementSearchActivity.h
+++ b/src/gui/elementsearch/ElementSearchActivity.h
@@ -10,11 +10,11 @@
class Tool;
-class GameModel;
+class GameController;
class ElementSearchActivity: public WindowActivity {
Tool * firstResult;
- GameModel * gameModel;
+ GameController * gameController;
std::vector<Tool*> tools;
ui::Textbox * searchField;
std::vector<ToolButton*> toolButtons;
@@ -22,7 +22,7 @@ class ElementSearchActivity: public WindowActivity {
public:
class ToolAction;
Tool * GetFirstResult() { return firstResult; }
- ElementSearchActivity(GameModel * gameModel, std::vector<Tool*> tools);
+ ElementSearchActivity(GameController * gameController, std::vector<Tool*> tools);
void SetActiveTool(int selectionState, Tool * tool);
virtual ~ElementSearchActivity();
virtual void OnDraw();