Local Saving, Server Saving rewrite

2 files changed, 3 insertions, 12 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;
diff --git a/src/elementsearch/ElementSearchActivity.h b/src/elementsearch/ElementSearchActivity.h
index 7ed7611..de9700d 100644
--- a/src/elementsearch/ElementSearchActivity.h
+++ b/src/elementsearch/ElementSearchActivity.h
@@ -10,6 +10,7 @@
 
 #include <vector>
 #include <string>
+#include "Activity.h"
 #include "interface/Window.h"
 #include "interface/Textbox.h"
 #include "game/ToolButton.h"
@@ -18,7 +19,7 @@ class Tool;
 
 class GameModel;
 
-class ElementSearchActivity: public ui::Window {
+class ElementSearchActivity: public WindowActivity {
 	Tool * firstResult;
 	GameModel * gameModel;
 	std::vector<Tool*> tools;
@@ -29,7 +30,6 @@ public:
 	class ToolAction;
 	Tool * GetFirstResult() { return firstResult; }
 	ElementSearchActivity(GameModel * gameModel, std::vector<Tool*> tools);
-	void Exit();
 	void SetActiveTool(int selectionState, Tool * tool);
 	virtual ~ElementSearchActivity();
 	virtual void OnDraw();