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

fix resume simulation/reload in the middle of subframe debugging (#330)

Browse Source
This commit is contained in:
Mark Theng 2016-09-05 09:33:33 +08:00 committed by jacob1
parent 2df333c99f
commit 8de12d616e
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
#ifndef GAMECONTROLLER_H #ifndef GAMECONTROLLER_H
#define GAMECONTROLLER_H #define GAMECONTROLLER_H
#include <queue> #include <queue>

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

@ -843,6 +843,13 @@ void GameModel::SetUser(User user)
void GameModel::SetPaused(bool pauseState) void GameModel::SetPaused(bool pauseState)
{ {
if(!pauseState && sim->debug_currentParticle > 0)
{
sim->UpdateParticles(sim->debug_currentParticle, NPART);
sim->AfterSim();
sim->debug_currentParticle = 0;
}
sim->sys_pause = pauseState?1:0; sim->sys_pause = pauseState?1:0;
notifyPausedChanged(); notifyPausedChanged();
} }

1
src/simulation/Simulation.cpp
View File

@ -1902,6 +1902,7 @@ void Simulation::create_arc(int sx, int sy, int dx, int dy, int midpoints, int v
void Simulation::clear_sim(void) void Simulation::clear_sim(void)
{ {
debug_currentParticle = 0;
emp_decor = 0; emp_decor = 0;
emp_trigger_count = 0; emp_trigger_count = 0;
signs.clear(); signs.clear();