summaryrefslogtreecommitdiff
path: root/src/game/GameModel.h
diff options
context:
space:
mode:
authorSimon Robertshaw <simon@hardwired.org.uk>2012-01-26 18:06:23 (GMT)
committer Simon Robertshaw <simon@hardwired.org.uk>2012-01-26 18:06:23 (GMT)
commite84f0fc6e5301265708a99b13ab898ce45422611 (patch)
tree2bbcf8aeb7e0b4177ccaa22a0bde2add3c696765 /src/game/GameModel.h
parent824d3c069bc409d268a2a15352e96868a7731a56 (diff)
downloadpowder-e84f0fc6e5301265708a99b13ab898ce45422611.zip
powder-e84f0fc6e5301265708a99b13ab898ce45422611.tar.gz
Ellipse cursor
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 b8f5217..72e2875 100644
--- a/src/game/GameModel.h
+++ b/src/game/GameModel.h
@@ -25,7 +25,8 @@ private:
vector<Tool*> toolList;
vector<Menu*> menuList;
Menu * activeMenu;
- Brush * currentBrush;
+ int currentBrush;
+ vector<Brush *> brushList;
Save * currentSave;
Simulation * sim;
Renderer * ren;
@@ -43,6 +44,7 @@ private:
public:
GameModel();
~GameModel();
+
Save * GetSave();
Brush * GetBrush();
void SetSave(Save * newSave);
@@ -58,6 +60,8 @@ public:
Menu * GetActiveMenu();
User GetUser();
void SetUser(User user);
+ void SetBrush(int i);
+ int GetBrushID();
Simulation * GetSimulation();
Renderer * GetRenderer();
};