diff options
| author | Simon Robertshaw <simon@hardwired.org.uk> | 2012-01-25 19:18:24 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2012-01-25 19:18:24 (GMT) |
| commit | b2d3257ae944a3ea3b57dc8ee4171b1b2f85483e (patch) | |
| tree | 38adf87af2bcf2bbc5d4578b3ab39e09aa064265 /src/game/GameController.cpp | |
| parent | c5cc1870f3ec0d9b6499b04b4ab2123bcf58db84 (diff) | |
| download | powder-b2d3257ae944a3ea3b57dc8ee4171b1b2f85483e.zip powder-b2d3257ae944a3ea3b57dc8ee4171b1b2f85483e.tar.gz | |
Better way of managing Controllers
Diffstat (limited to 'src/game/GameController.cpp')
| -rw-r--r-- | src/game/GameController.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/game/GameController.cpp b/src/game/GameController.cpp index 85518f7..5399cf8 100644 --- a/src/game/GameController.cpp +++ b/src/game/GameController.cpp @@ -19,8 +19,6 @@ public: virtual void ControllerExit() { cc->gameModel->SetUser(cc->loginWindow->GetUser()); - delete cc->loginWindow; - cc->loginWindow = NULL; } }; @@ -116,9 +114,14 @@ void GameController::DrawPoints(queue<ui::Point*> & pointQueue) } } -void GameController::Tick() +void GameController::Update() { //gameModel->GetSimulation()->update_particles(); + if(loginWindow && loginWindow->HasExited) + { + delete loginWindow; + loginWindow = NULL; + } } void GameController::SetPaused(bool pauseState) |