summaryrefslogtreecommitdiff
path: root/src/game
diff options
context:
space:
mode:
authorSimon Robertshaw <simon@hardwired.org.uk>2012-01-20 23:42:17 (GMT)
committer Simon Robertshaw <simon@hardwired.org.uk>2012-01-20 23:42:17 (GMT)
commitfa201a7aeb6c645801a11a115ef6baeed9edf1e5 (patch)
tree616a98dddd3b6f93dd6580f762298690c320b3bf /src/game
parent6a331fdaf848ce82adc930ad24ac15c5259d2262 (diff)
downloadpowder-fa201a7aeb6c645801a11a115ef6baeed9edf1e5.zip
powder-fa201a7aeb6c645801a11a115ef6baeed9edf1e5.tar.gz
Fix some uninitialised variables
Diffstat (limited to 'src/game')
-rw-r--r--src/game/GameController.cpp2
-rw-r--r--src/game/GameModel.cpp4
2 files changed, 4 insertions, 2 deletions
diff --git a/src/game/GameController.cpp b/src/game/GameController.cpp
index e029fc9..07f2722 100644
--- a/src/game/GameController.cpp
+++ b/src/game/GameController.cpp
@@ -54,7 +54,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 3d5a800..50f266f 100644
--- a/src/game/GameModel.cpp
+++ b/src/game/GameModel.cpp
@@ -5,7 +5,9 @@
#include "Renderer.h"
GameModel::GameModel():
- activeElement(1)
+ activeElement(1),
+ sim(NULL),
+ ren(NULL)
{
sim = new Simulation();
ren = new Renderer(ui::Engine::Ref().g, sim);