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

Merge branch 'master' of github.com:FacialTurd/PowderToypp

Browse Source
This commit is contained in:
Bryan Hoyle 2012-08-20 16:59:37 -04:00
commit a403be9890
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/game/GameModel.cpp
View File

@ -433,6 +433,7 @@ void GameModel::SetSave(SaveInfo * newSave)
sim->grav->stop_grav_async(); sim->grav->stop_grav_async();
sim->clear_sim(); sim->clear_sim();
sim->SetEdgeMode(0); sim->SetEdgeMode(0);
ren->ClearAccumulation();
sim->Load(saveData); sim->Load(saveData);
} }
notifySaveChanged(); notifySaveChanged();
@ -460,6 +461,8 @@ void GameModel::SetSaveFile(SaveFile * newSave)
sim->grav->stop_grav_async(); sim->grav->stop_grav_async();
} }
sim->clear_sim(); sim->clear_sim();
sim->SetEdgeMode(0);
ren->ClearAccumulation();
sim->Load(saveData); sim->Load(saveData);
} }
@ -623,6 +626,7 @@ void GameModel::FrameStep(int frames)
void GameModel::ClearSimulation() void GameModel::ClearSimulation()
{ {
sim->clear_sim(); sim->clear_sim();
ren->ClearAccumulation();
} }
void GameModel::SetStamp(GameSave * save) void GameModel::SetStamp(GameSave * save)