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

DLAY temp, actually fixed :D

Browse Source
This commit is contained in:
tridiaq 2011-07-27 01:02:01 +08:00 committed by Simon Robertshaw
parent 108e5643d7
commit 94e316af85
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/powder.c
View File

@ -713,10 +713,16 @@ inline int create_part(int p, int x, int y, int tv)//the function for creating a
return -1; return -1;
if (parts[pmap[y][x]>>8].life!=0) if (parts[pmap[y][x]>>8].life!=0)
return -1; return -1;
parts[pmap[y][x]>>8].type = PT_SPRK; if ((pmap[y][x]&0xFF)==PT_DLAY) {
parts[pmap[y][x]>>8].life = 4; parts[pmap[y][x]>>8].type = PT_SPRK;
parts[pmap[y][x]>>8].ctype = pmap[y][x]&0xFF; parts[pmap[y][x]>>8].life = (int)parts[pmap[y][x]>>8].temp;
pmap[y][x] = (pmap[y][x]&~0xFF) | PT_SPRK; parts[pmap[y][x]>>8].tmp2 = *((int*)(&parts[pmap[y][x]>>8].temp));
} else {
parts[pmap[y][x]>>8].type = PT_SPRK;
parts[pmap[y][x]>>8].life = 4;
parts[pmap[y][x]>>8].ctype = pmap[y][x]&0xFF;
pmap[y][x] = (pmap[y][x]&~0xFF) | PT_SPRK;
}
return pmap[y][x]>>8; return pmap[y][x]>>8;
} }
if (t==PT_SPAWN&&ISSPAWN1) if (t==PT_SPAWN&&ISSPAWN1)
@ -984,8 +990,6 @@ inline int create_part(int p, int x, int y, int tv)//the function for creating a
} }
if (t==PT_BIZR||t==PT_BIZRG) if (t==PT_BIZR||t==PT_BIZRG)
parts[i].ctype = 0x47FFFF; parts[i].ctype = 0x47FFFF;
if (t==PT_DLAY)
parts[i].tmp2 = *((int*)(&parts[i].temp));
//and finally set the pmap/photon maps to the newly created particle //and finally set the pmap/photon maps to the newly created particle
if (t==PT_PHOT||t==PT_NEUT) if (t==PT_PHOT||t==PT_NEUT)
photons[y][x] = t|(i<<8); photons[y][x] = t|(i<<8);