summaryrefslogtreecommitdiff
path: root/src/elementsearch/ElementSearchActivity.cpp
diff options
context:
space:
mode:
authorSimon Robertshaw <simon@hardwired.org.uk>2012-08-01 21:29:22 (GMT)
committer Simon Robertshaw <simon@hardwired.org.uk>2012-08-01 21:29:22 (GMT)
commitcbefea85d717bd599fa0559f091b051e904d9e2f (patch)
treee11849927aa88b270470c55d8b0fc052d34851e4 /src/elementsearch/ElementSearchActivity.cpp
parent29ac6380ba649e30dc29771b2833a86f20c9dbfe (diff)
downloadpowder-cbefea85d717bd599fa0559f091b051e904d9e2f.zip
powder-cbefea85d717bd599fa0559f091b051e904d9e2f.tar.gz
Local Saving, Server Saving rewrite
Diffstat (limited to 'src/elementsearch/ElementSearchActivity.cpp')
-rw-r--r--src/elementsearch/ElementSearchActivity.cpp11
1 files changed, 1 insertions, 10 deletions
diff --git a/src/elementsearch/ElementSearchActivity.cpp b/src/elementsearch/ElementSearchActivity.cpp
index 7a87995..1ee41e1 100644
--- a/src/elementsearch/ElementSearchActivity.cpp
+++ b/src/elementsearch/ElementSearchActivity.cpp
@@ -28,7 +28,7 @@ public:
};
ElementSearchActivity::ElementSearchActivity(GameModel * gameModel, std::vector<Tool*> tools) :
- Window(ui::Point(-1, -1), ui::Point(236, 302)),
+ WindowActivity(ui::Point(-1, -1), ui::Point(236, 302)),
gameModel(gameModel),
tools(tools),
firstResult(NULL)
@@ -154,15 +154,6 @@ void ElementSearchActivity::SetActiveTool(int selectionState, Tool * tool)
Exit();
}
-void ElementSearchActivity::Exit()
-{
- if(ui::Engine::Ref().GetWindow() == this)
- {
- ui::Engine::Ref().CloseWindow();
- }
- SelfDestruct();
-}
-
void ElementSearchActivity::OnDraw()
{
Graphics * g = ui::Engine::Ref().g;