diff options
| author | Simon Robertshaw <simon@hardwired.org.uk> | 2012-08-05 17:35:12 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2012-08-05 17:35:12 (GMT) |
| commit | 4ce22e4e7705224a9b4c1b9bfa8886de0029a3e3 (patch) | |
| tree | d9c02db57d9a20709758d7b771ee60ea9cbe4e88 /src/game/GameModel.cpp | |
| parent | 30f8049efc6efc086509d235df413e4932dab83e (diff) | |
| download | powder-4ce22e4e7705224a9b4c1b9bfa8886de0029a3e3.zip powder-4ce22e4e7705224a9b4c1b9bfa8886de0029a3e3.tar.gz | |
Wall Edge option, fixes #70
Diffstat (limited to 'src/game/GameModel.cpp')
| -rw-r--r-- | src/game/GameModel.cpp | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/src/game/GameModel.cpp b/src/game/GameModel.cpp index 91d6a4f..a53bba2 100644 --- a/src/game/GameModel.cpp +++ b/src/game/GameModel.cpp @@ -33,16 +33,16 @@ GameModel::GameModel(): //Load config into renderer try { - ren->SetColourMode(Client::Ref().GetPrefNumber("Renderer.ColourMode", 0)); + ren->SetColourMode(Client::Ref().GetPrefUInteger("Renderer.ColourMode", 0)); - vector<double> tempArray = Client::Ref().GetPrefNumberArray("Renderer.DisplayModes"); + vector<unsigned int> tempArray = Client::Ref().GetPrefUIntegerArray("Renderer.DisplayModes"); if(tempArray.size()) { std::vector<unsigned int> displayModes(tempArray.begin(), tempArray.end()); ren->SetDisplayMode(displayModes); } - tempArray = Client::Ref().GetPrefNumberArray("Renderer.RenderModes"); + tempArray = Client::Ref().GetPrefUIntegerArray("Renderer.RenderModes"); if(tempArray.size()) { std::vector<unsigned int> renderModes(tempArray.begin(), tempArray.end()); @@ -54,6 +54,9 @@ GameModel::GameModel(): } + //Load config into simulation + sim->SetEdgeMode(Client::Ref().GetPrefInteger("Simulation.EdgeMode", 0)); + //Load last user if(Client::Ref().GetAuthUser().ID) { @@ -84,13 +87,15 @@ GameModel::GameModel(): GameModel::~GameModel() { //Save to config: - Client::Ref().SetPref("Renderer.ColourMode", (double)ren->GetColourMode()); + Client::Ref().SetPref("Renderer.ColourMode", ren->GetColourMode()); std::vector<unsigned int> displayModes = ren->GetDisplayMode(); - Client::Ref().SetPref("Renderer.DisplayModes", std::vector<double>(displayModes.begin(), displayModes.end())); + Client::Ref().SetPref("Renderer.DisplayModes", std::vector<unsigned int>(displayModes.begin(), displayModes.end())); std::vector<unsigned int> renderModes = ren->GetRenderMode(); - Client::Ref().SetPref("Renderer.RenderModes", std::vector<double>(renderModes.begin(), renderModes.end())); + Client::Ref().SetPref("Renderer.RenderModes", std::vector<unsigned int>(renderModes.begin(), renderModes.end())); + + Client::Ref().SetPref("Simulation.EdgeMode", sim->edgeMode); Client::Ref().SetPref("Decoration.Red", (int)colour.Red); Client::Ref().SetPref("Decoration.Green", (int)colour.Green); |