matthew/The-Powder-Toy
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

GameController shut down any render options open

Browse Source
This commit is contained in:
Simon Robertshaw 2012-01-23 11:48:08 +00:00
parent 27755b2f27
commit 2bd571e159
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/game/GameController.cpp
View File

@ -11,7 +11,8 @@
using namespace std;
GameController::GameController():
search(NULL)
search(NULL),
renderOptions(NULL)
{
gameView = new GameView();
gameModel = new GameModel();
@ -29,6 +30,11 @@ GameController::~GameController()
ui::Engine::Ref().CloseWindow();
delete search;
}
if(renderOptions)
{
ui::Engine::Ref().CloseWindow();
delete renderOptions;
}
delete gameView;
delete gameModel;
}
@ -135,8 +141,8 @@ void GameController::OpenDisplayOptions()
void GameController::OpenRenderOptions()
{
RenderController * renderController = new RenderController(gameModel->GetRenderer());
ui::Engine::Ref().ShowWindow(renderController->GetView());
renderOptions = new RenderController(gameModel->GetRenderer());
ui::Engine::Ref().ShowWindow(renderOptions->GetView());
}
void GameController::OpenSaveWindow()

2
src/game/GameController.h
View File

@ -7,6 +7,7 @@
#include "interface/Point.h"
#include "simulation/Simulation.h"
#include "search/SearchController.h"
#include "render/RenderController.h"
#include "Menu.h"
using namespace std;
@ -20,6 +21,7 @@ private:
GameView * gameView;
GameModel * gameModel;
SearchController * search;
RenderController * renderOptions;
public:
GameController();
~GameController();