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

Preserve stacked particles in saves being placed (fixes #743)

Browse Source
This commit is contained in:
Tamás Bálint Misius 2020-11-16 12:53:58 +01:00
parent 2273233b71
commit 86a621741d
No known key found for this signature in database
GPG Key ID: 5B472A12F6ECA9F2
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/simulation/Simulation.cpp
View File

@ -156,6 +156,10 @@ int Simulation::Load(GameSave * save, bool includePressure, int fullX, int fullY
parts[ID(r)] = tempPart; parts[ID(r)] = tempPart;
i = ID(r); i = ID(r);
elementCount[tempPart.type]++; elementCount[tempPart.type]++;
// * pmap will be repopulated a bit later by RecalcFreeParticles;
// until then, remove the entry so the next new particle at the
// same position doesn't overwrite the one we've just copied
pmap[y][x] = 0;
} }
else if ((r = photons[y][x])) else if ((r = photons[y][x]))
{ {
@ -163,6 +167,8 @@ int Simulation::Load(GameSave * save, bool includePressure, int fullX, int fullY
parts[ID(r)] = tempPart; parts[ID(r)] = tempPart;
i = ID(r); i = ID(r);
elementCount[tempPart.type]++; elementCount[tempPart.type]++;
// * same as with pmap above
photons[y][x] = 0;
} }
//Allocate new particle //Allocate new particle
else else