summaryrefslogtreecommitdiff
path: root/src/game/GameController.cpp
diff options
context:
space:
mode:
authorSimon Robertshaw <simon@hardwired.org.uk>2012-01-23 10:50:48 (GMT)
committer Simon Robertshaw <simon@hardwired.org.uk>2012-01-23 10:50:48 (GMT)
commit8a65c395f490baea3b55f1418207c4ee172a2b3a (patch)
tree261957afa7218bd67d4a59c32594488aff269861 /src/game/GameController.cpp
parent8c0678fa48f9598a5ade2d4960c46bfea7e6abef (diff)
downloadpowder-8a65c395f490baea3b55f1418207c4ee172a2b3a.zip
powder-8a65c395f490baea3b55f1418207c4ee172a2b3a.tar.gz
Element menu
Diffstat (limited to 'src/game/GameController.cpp')
-rw-r--r--src/game/GameController.cpp12
1 files changed, 11 insertions, 1 deletions
diff --git a/src/game/GameController.cpp b/src/game/GameController.cpp
index 5749fd4..9056ba8 100644
--- a/src/game/GameController.cpp
+++ b/src/game/GameController.cpp
@@ -88,7 +88,7 @@ void GameController::DrawPoints(queue<ui::Point*> & pointQueue)
void GameController::Tick()
{
- //gameModel->GetSimulation()->update_particles();
+ gameModel->GetSimulation()->update_particles();
}
void GameController::SetPaused(bool pauseState)
@@ -96,11 +96,21 @@ void GameController::SetPaused(bool pauseState)
gameModel->SetPaused(pauseState);
}
+void GameController::SetPaused()
+{
+ gameModel->SetPaused(!gameModel->GetPaused());
+}
+
void GameController::SetActiveMenu(Menu * menu)
{
gameModel->SetActiveMenu(menu);
}
+void GameController::SetActiveTool(Tool * tool)
+{
+ gameModel->SetActiveTool(tool);
+}
+
void GameController::OpenSearch()
{
search = new SearchController();