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

fix bug where PROP wouldn't set properties of particle id 0

Browse Source
This commit is contained in:
jacob1 2013-08-29 22:34:50 -04:00
parent d38af2764c
commit 2cbee180a1
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

@ -388,23 +388,23 @@ int Simulation::flood_prop_2(int x, int y, size_t propoffset, void * propvalue,
} }
for (x=x1; x<=x2; x++) for (x=x1; x<=x2; x++)
{ {
i = pmap[y][x]>>8; i = pmap[y][x];
if (!i) if (!i)
i = photons[y][x]>>8; i = photons[y][x];
if (!i) if (!i)
continue; continue;
switch (proptype) { switch (proptype) {
case StructProperty::Float: case StructProperty::Float:
*((float*)(((char*)&parts[i])+propoffset)) = *((float*)propvalue); *((float*)(((char*)&parts[i>>8])+propoffset)) = *((float*)propvalue);
break; break;
case StructProperty::ParticleType: case StructProperty::ParticleType:
case StructProperty::Integer: case StructProperty::Integer:
*((int*)(((char*)&parts[i])+propoffset)) = *((int*)propvalue); *((int*)(((char*)&parts[i>>8])+propoffset)) = *((int*)propvalue);
break; break;
case StructProperty::UInteger: case StructProperty::UInteger:
*((unsigned int*)(((char*)&parts[i])+propoffset)) = *((unsigned int*)propvalue); *((unsigned int*)(((char*)&parts[i>>8])+propoffset)) = *((unsigned int*)propvalue);
break; break;
default: default: