summaryrefslogtreecommitdiff
path: root/src/game/GameModel.h
diff options
context:
space:
mode:
authorSimon Robertshaw <simon@hardwired.org.uk>2012-01-25 17:21:55 (GMT)
committer Simon Robertshaw <simon@hardwired.org.uk>2012-01-25 17:21:55 (GMT)
commit8b80942b16fd6292884fb3208bc52c29a25cfff8 (patch)
treefebd0a9004932d602f5de0be3ebf358a8611e1f2 /src/game/GameModel.h
parent3505bcc275dc2e276386e51b1dc13325d4eefa07 (diff)
downloadpowder-8b80942b16fd6292884fb3208bc52c29a25cfff8.zip
powder-8b80942b16fd6292884fb3208bc52c29a25cfff8.tar.gz
Login working, segfaults sometimes
Diffstat (limited to 'src/game/GameModel.h')
-rw-r--r--src/game/GameModel.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/game/GameModel.h b/src/game/GameModel.h
index 14319e7..b8f5217 100644
--- a/src/game/GameModel.h
+++ b/src/game/GameModel.h
@@ -7,6 +7,7 @@
#include "Renderer.h"
#include "GameView.h"
#include "Brush.h"
+#include "client/User.h"
#include "Tool.h"
#include "Menu.h"
@@ -29,6 +30,7 @@ private:
Simulation * sim;
Renderer * ren;
Tool * activeTool;
+ User currentUser;
void notifyRendererChanged();
void notifySimulationChanged();
void notifyPausedChanged();
@@ -37,6 +39,7 @@ private:
void notifyMenuListChanged();
void notifyToolListChanged();
void notifyActiveToolChanged();
+ void notifyUserChanged();
public:
GameModel();
~GameModel();
@@ -53,7 +56,8 @@ public:
vector<Tool*> GetToolList();
void SetActiveMenu(Menu * menu);
Menu * GetActiveMenu();
-
+ User GetUser();
+ void SetUser(User user);
Simulation * GetSimulation();
Renderer * GetRenderer();
};