when called with no arguments, some tpt. functions will act as get functions (unfinished)

Also, redo some menu stuff to use int's instead of Menu *s, and fix bug with toggleable buttons being toggled without triggering their actions

1 files changed, 3 insertions, 3 deletions

diff --git a/src/gui/game/GameModel.h b/src/gui/game/GameModel.h
index f8ccfb5..dd54d91 100644
--- a/src/gui/game/GameModel.h
+++ b/src/gui/game/GameModel.h
@@ -53,7 +53,7 @@ private:
 
 	vector<Menu*> menuList;
 	vector<QuickOption*> quickOptions;
-	Menu * activeMenu;
+	int activeMenu;
 	int currentBrush;
 	vector<Brush *> brushList;
 	SaveInfo * currentSave;
@@ -168,8 +168,8 @@ public:
 	void ClearSimulation();
 	vector<Menu*> GetMenuList();
 	vector<QuickOption*> GetQuickOptions();
-	void SetActiveMenu(Menu * menu);
-	Menu * GetActiveMenu();
+	void SetActiveMenu(int menuID);
+	int GetActiveMenu();
 	void FrameStep(int frames);
 	User GetUser();
 	void SetUser(User user);