summaryrefslogtreecommitdiff
path: root/src/options/OptionsController.cpp
diff options
context:
space:
mode:
authorSimon Robertshaw <simon@hardwired.org.uk>2012-09-30 15:19:44 (GMT)
committer Simon Robertshaw <simon@hardwired.org.uk>2012-09-30 15:19:44 (GMT)
commit90ebd3e54c376b7baa80d9d739f3ace62f6991cd (patch)
tree088fda9399f50b6f172e36ae5ffe6c89c0f338ab /src/options/OptionsController.cpp
parentd6f832b4f572bbb79a33590da71c2d8975b15728 (diff)
downloadpowder-90ebd3e54c376b7baa80d9d739f3ace62f6991cd.zip
powder-90ebd3e54c376b7baa80d9d739f3ace62f6991cd.tar.gz
Better hanling of edgeMode and "New Sim" button
Diffstat (limited to 'src/options/OptionsController.cpp')
-rw-r--r--src/options/OptionsController.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/options/OptionsController.cpp b/src/options/OptionsController.cpp
index add8cf7..579ad73 100644
--- a/src/options/OptionsController.cpp
+++ b/src/options/OptionsController.cpp
@@ -8,12 +8,13 @@
#include "OptionsController.h"
#include "dialogues/ErrorMessage.h"
-OptionsController::OptionsController(Simulation * sim, ControllerCallback * callback_):
+OptionsController::OptionsController(GameModel * gModel_, ControllerCallback * callback_):
callback(callback_),
+ gModel(gModel_),
HasExited(false)
{
view = new OptionsView();
- model = new OptionsModel(sim);
+ model = new OptionsModel(gModel);
model->AddObserver(view);
view->AttachController(this);