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

don't reset edge mode when saving local saves

Browse Source
This commit is contained in:
jacob1 2016-06-30 08:16:53 -04:00
parent dfdee7afeb
commit ecddfcbc0d
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/game/GameController.cpp
View File

@ -1351,7 +1351,7 @@ void GameController::SaveAsCurrent()
GameController * c; GameController * c;
public: public:
SaveUploadedCallback(GameController * _c): c(_c) {} SaveUploadedCallback(GameController * _c): c(_c) {}
virtual ~SaveUploadedCallback() {}; virtual ~SaveUploadedCallback() {}
virtual void SaveUploaded(SaveInfo save) virtual void SaveUploaded(SaveInfo save)
{ {
c->LoadSave(&save); c->LoadSave(&save);

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

@ -654,7 +654,6 @@ void GameModel::SetSaveFile(SaveFile * newSave)
{ {
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);