summaryrefslogtreecommitdiff
path: root/src/game/GameController.cpp
diff options
context:
space:
mode:
authorSimon Robertshaw <simon@hardwired.org.uk>2012-01-26 16:18:43 (GMT)
committer Simon Robertshaw <simon@hardwired.org.uk>2012-01-26 16:18:43 (GMT)
commitd520a70acfdf7ba5a007aee1f92453642b474c08 (patch)
tree4cfc4c16bd9be7c1a4561356807ba07d943c1abc /src/game/GameController.cpp
parent9e1be78bc21d1fb76a19ce12ef36193aea6e2b93 (diff)
downloadpowder-d520a70acfdf7ba5a007aee1f92453642b474c08.zip
powder-d520a70acfdf7ba5a007aee1f92453642b474c08.tar.gz
Save loading and reloading
Diffstat (limited to 'src/game/GameController.cpp')
-rw-r--r--src/game/GameController.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/game/GameController.cpp b/src/game/GameController.cpp
index e8efe0b..90ef70c 100644
--- a/src/game/GameController.cpp
+++ b/src/game/GameController.cpp
@@ -148,7 +148,7 @@ void GameController::DrawPoints(queue<ui::Point*> & pointQueue)
void GameController::Update()
{
- //gameModel->GetSimulation()->update_particles();
+ gameModel->GetSimulation()->update_particles();
if(renderOptions && renderOptions->HasExited)
{
delete renderOptions;
@@ -234,7 +234,8 @@ void GameController::ClearSim()
void GameController::ReloadSim()
{
- //TODO: Implement
+ if(gameModel->GetSave() && gameModel->GetSave()->GetData())
+ gameModel->GetSimulation()->Load(gameModel->GetSave()->GetData(), gameModel->GetSave()->GetDataLength());
}