fix edge mode not loading properly in saves, options menu uses edge m…

…ode from Simulation and not GameModel
The-Powder-Toy · Oct 10, 2015 · f435cf3 · f435cf3
1 parent a8c141c
commit f435cf3
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/src/gui/game/GameModel.cpp b/src/gui/game/GameModel.cpp
@@ -575,7 +575,6 @@ void GameModel::SetSave(SaveInfo * newSave)
 			sim->grav->start_grav_async();
 		else
 			sim->grav->stop_grav_async();
-		sim->SetEdgeMode(0);
 		sim->clear_sim();
 		ren->ClearAccumulation();
 		sim->Load(saveData);

diff --git a/src/gui/options/OptionsModel.cpp b/src/gui/options/OptionsModel.cpp
@@ -72,7 +72,7 @@ void OptionsModel::SetAirMode(int airMode)
 
 int OptionsModel::GetEdgeMode()
 {
-	return gModel->GetEdgeMode();
+	return gModel->GetSimulation()->edgeMode;
 }
 void OptionsModel::SetEdgeMode(int edgeMode)
 {