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

Fix particle maps sometimes being stale when pasting

Browse Source 
This restrict effects of paste-time de-stacking to positions under particles being pasted. If this is not done, particles beyond the paste area can be wrongfully killed, see #889.
This commit is contained in:
Tamás Bálint Misius 2023-01-10 08:06:47 +01:00
parent 853c47b0bd
commit d02242714e
No known key found for this signature in database
GPG Key ID: 5B472A12F6ECA9F2
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/simulation/Simulation.cpp
View File

@ -87,7 +87,8 @@ int Simulation::Load(const GameSave * originalSave, bool includePressure, int fu
} }
} }
int r; RecalcFreeParticles(false);
bool doFullScan = false; bool doFullScan = false;
for (int n = 0; n < NPART && n < save->particlesCount; n++) for (int n = 0; n < NPART && n < save->particlesCount; n++)
{ {
@ -133,13 +134,13 @@ int Simulation::Load(const GameSave * originalSave, bool includePressure, int fu
continue; continue;
} }
if ((r = pmap[y][x])) if (pmap[y][x])
{ {
// Particle already exists in this location. Set pmap to 0, then kill it and all stacked particles in the loop below // Particle already exists in this location. Set pmap to 0, then kill it and all stacked particles in the loop below
pmap[y][x] = 0; pmap[y][x] = 0;
doFullScan = true; doFullScan = true;
} }
else if ((r = photons[y][x])) else if (photons[y][x])
{ {
// Particle already exists in this location. Set photons to 0, then kill it and all stacked particles in the loop below // Particle already exists in this location. Set photons to 0, then kill it and all stacked particles in the loop below
photons[y][x] = 0; photons[y][x] = 0;
@ -169,7 +170,6 @@ int Simulation::Load(const GameSave * originalSave, bool includePressure, int fu
} }
} }
int i;
// Map of soap particles loaded into this save, old ID -> new ID // Map of soap particles loaded into this save, old ID -> new ID
std::map<unsigned int, unsigned int> soapList; std::map<unsigned int, unsigned int> soapList;
for (int n = 0; n < NPART && n < save->particlesCount; n++) for (int n = 0; n < NPART && n < save->particlesCount; n++)
@ -209,7 +209,7 @@ int Simulation::Load(const GameSave * originalSave, bool includePressure, int fu
// Allocate particle (this location is guaranteed to be empty due to "full scan" logic above) // Allocate particle (this location is guaranteed to be empty due to "full scan" logic above)
if (pfree == -1) if (pfree == -1)
break; break;
i = pfree; auto i = pfree;
pfree = parts[i].life; pfree = parts[i].life;
if (i > parts_lastActiveIndex) if (i > parts_lastActiveIndex)
parts_lastActiveIndex = i; parts_lastActiveIndex = i;