summaryrefslogtreecommitdiff
path: root/src/game
diff options
context:
space:
mode:
authorSimon Robertshaw <simon@hardwired.org.uk>2012-01-25 18:42:35 (GMT)
committer Simon Robertshaw <simon@hardwired.org.uk>2012-01-25 18:42:35 (GMT)
commitc5cc1870f3ec0d9b6499b04b4ab2123bcf58db84 (patch)
treea21e48a8daad6f023cfbb5ab7ffb393918a5f5c1 /src/game
parent8b80942b16fd6292884fb3208bc52c29a25cfff8 (diff)
downloadpowder-c5cc1870f3ec0d9b6499b04b4ab2123bcf58db84.zip
powder-c5cc1870f3ec0d9b6499b04b4ab2123bcf58db84.tar.gz
Fix some memory leaks
Diffstat (limited to 'src/game')
-rw-r--r--src/game/GameController.cpp2
-rw-r--r--src/game/GameModel.cpp2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/game/GameController.cpp b/src/game/GameController.cpp
index d7c9633..85518f7 100644
--- a/src/game/GameController.cpp
+++ b/src/game/GameController.cpp
@@ -118,7 +118,7 @@ void GameController::DrawPoints(queue<ui::Point*> & pointQueue)
void GameController::Tick()
{
- gameModel->GetSimulation()->update_particles();
+ //gameModel->GetSimulation()->update_particles();
}
void GameController::SetPaused(bool pauseState)
diff --git a/src/game/GameModel.cpp b/src/game/GameModel.cpp
index 8062c64..33eb143 100644
--- a/src/game/GameModel.cpp
+++ b/src/game/GameModel.cpp
@@ -54,6 +54,8 @@ GameModel::~GameModel()
}
delete sim;
delete ren;
+ if(activeTool)
+ delete activeTool;
}
Brush * GameModel::GetBrush()