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

fix issue where stamps would stack if you loaded multiple in one frame

Browse Source 
sim.loadStamp in the console, or a lua script
This commit is contained in:
jacob1 2017-12-03 19:30:21 -05:00
parent 63c13bda89
commit e956e7c5fd
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/simulation/Simulation.cpp
View File

@ -123,7 +123,7 @@ int Simulation::Load(int fullX, int fullY, GameSave * save, bool includePressure
elementCount[parts[r>>8].type]--; elementCount[parts[r>>8].type]--;
parts[r>>8] = tempPart; parts[r>>8] = tempPart;
i = r>>8; i = r>>8;
pmap[y][x] = 0; pmap[y][x] = tempPart.type | i<<8;
elementCount[tempPart.type]++; elementCount[tempPart.type]++;
} }
else if ((r = photons[y][x])) else if ((r = photons[y][x]))
@ -131,7 +131,7 @@ int Simulation::Load(int fullX, int fullY, GameSave * save, bool includePressure
elementCount[parts[r>>8].type]--; elementCount[parts[r>>8].type]--;
parts[r>>8] = tempPart; parts[r>>8] = tempPart;
i = r>>8; i = r>>8;
photons[y][x] = 0; photons[y][x] = tempPart.type | i<<8;
elementCount[tempPart.type]++; elementCount[tempPart.type]++;
} }
//Allocate new particle //Allocate new particle
@ -141,9 +141,10 @@ int Simulation::Load(int fullX, int fullY, GameSave * save, bool includePressure
break; break;
i = pfree; i = pfree;
pfree = parts[i].life; pfree = parts[i].life;
if (i>parts_lastActiveIndex) parts_lastActiveIndex = i; if (i > parts_lastActiveIndex)
parts_lastActiveIndex = i;
parts[i] = tempPart; parts[i] = tempPart;
pmap[y][x] = tempPart.type | i<<8;
elementCount[tempPart.type]++; elementCount[tempPart.type]++;
} }