diff options
| author | Simon 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) |
| commit | 90ebd3e54c376b7baa80d9d739f3ace62f6991cd (patch) | |
| tree | 088fda9399f50b6f172e36ae5ffe6c89c0f338ab /src/options/OptionsModel.cpp | |
| parent | d6f832b4f572bbb79a33590da71c2d8975b15728 (diff) | |
| download | powder-90ebd3e54c376b7baa80d9d739f3ace62f6991cd.zip powder-90ebd3e54c376b7baa80d9d739f3ace62f6991cd.tar.gz | |
Better hanling of edgeMode and "New Sim" button
Diffstat (limited to 'src/options/OptionsModel.cpp')
| -rw-r--r-- | src/options/OptionsModel.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/options/OptionsModel.cpp b/src/options/OptionsModel.cpp index be88d9b..f9cef2f 100644 --- a/src/options/OptionsModel.cpp +++ b/src/options/OptionsModel.cpp @@ -6,10 +6,12 @@ */ #include "simulation/Air.h" +#include "game/GameModel.h" #include "OptionsModel.h" -OptionsModel::OptionsModel(Simulation * sim_) { - sim = sim_; +OptionsModel::OptionsModel(GameModel * gModel_) { + gModel = gModel_; + sim = gModel->GetSimulation(); } void OptionsModel::AddObserver(OptionsView* view) @@ -77,11 +79,11 @@ void OptionsModel::SetAirMode(int airMode) int OptionsModel::GetEdgeMode() { - return sim->edgeMode; + return gModel->GetEdgeMode(); } void OptionsModel::SetEdgeMode(int edgeMode) { - sim->SetEdgeMode(edgeMode); + gModel->SetEdgeMode(edgeMode); notifySettingsChanged(); } |