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

fix edge mode not loading properly in saves, options menu uses edge mode from Simulation and not GameModel

Browse Source
This commit is contained in:
jacob1 2015-10-10 18:10:17 -04:00
parent a8c141c144
commit f435cf3881
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/gui/game/GameModel.cpp
View File

@ -575,7 +575,6 @@ void GameModel::SetSave(SaveInfo * newSave)
sim->grav->start_grav_async(); sim->grav->start_grav_async();
else else
sim->grav->stop_grav_async(); sim->grav->stop_grav_async();
sim->SetEdgeMode(0);
sim->clear_sim(); sim->clear_sim();
ren->ClearAccumulation(); ren->ClearAccumulation();
sim->Load(saveData); sim->Load(saveData);

2
src/gui/options/OptionsModel.cpp
View File

@ -72,7 +72,7 @@ void OptionsModel::SetAirMode(int airMode)
int OptionsModel::GetEdgeMode() int OptionsModel::GetEdgeMode()
{ {
return gModel->GetEdgeMode(); return gModel->GetSimulation()->edgeMode;
} }
void OptionsModel::SetEdgeMode(int edgeMode) void OptionsModel::SetEdgeMode(int edgeMode)
{ {