summaryrefslogtreecommitdiff
path: root/src/game/GameController.h
diff options
context:
space:
mode:
authormniip <mniip@yandex.ru>2013-01-11 18:28:57 (GMT)
committer mniip <mniip@yandex.ru>2013-01-11 18:28:57 (GMT)
commitdf628c7fe3ee7bb28de79b68658669ba2213ab20 (patch)
tree7b32ae0012dfb70ca048254165b85ea314a97918 /src/game/GameController.h
parent269420c6c791bb48e9721afda608893b97bcd45b (diff)
downloadpowder-df628c7fe3ee7bb28de79b68658669ba2213ab20.zip
powder-df628c7fe3ee7bb28de79b68658669ba2213ab20.tar.gz
moving gameModel was a bad idea, so i just made an alias function
Diffstat (limited to 'src/game/GameController.h')
-rw-r--r--src/game/GameController.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/game/GameController.h b/src/game/GameController.h
index d8a24c9..53b83d4 100644
--- a/src/game/GameController.h
+++ b/src/game/GameController.h
@@ -36,6 +36,7 @@ private:
int screenshotIndex;
PreviewController * activePreview;
GameView * gameView;
+ GameModel * gameModel;
SearchController * search;
RenderController * renderOptions;
LoginController * loginWindow;
@@ -56,7 +57,6 @@ public:
class SaveOpenCallback;
friend class SaveOpenCallback;
GameController();
- GameModel * gameModel;
~GameController();
GameView * GetView();
@@ -148,6 +148,7 @@ public:
virtual void NotifyAuthUserChanged(Client * sender);
virtual void NotifyNewNotification(Client * sender, std::pair<std::string, std::string> notification);
void RunUpdater();
+ std::vector<Menu*> GetMenuList();
};
#endif // GAMECONTROLLER_H