diff options
| author | tridiaq <tridiaq@gmail.com> | 2011-07-26 17:02:01 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2011-07-26 17:24:09 (GMT) |
| commit | 94e316af854932ddd8f60b011de936000f10fac4 (patch) | |
| tree | eb551ea7aa44baef184b16e13e4cea1592249ce2 /src | |
| parent | 108e5643d7f96749d68f8e87d9b2bfddf1e5cf1a (diff) | |
| download | powder-94e316af854932ddd8f60b011de936000f10fac4.zip powder-94e316af854932ddd8f60b011de936000f10fac4.tar.gz | |
DLAY temp, actually fixed :D
Diffstat (limited to 'src')
| -rw-r--r-- | src/powder.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/src/powder.c b/src/powder.c index 447f3fd..c825210 100644 --- a/src/powder.c +++ b/src/powder.c @@ -713,10 +713,16 @@ inline int create_part(int p, int x, int y, int tv)//the function for creating a return -1; if (parts[pmap[y][x]>>8].life!=0) return -1; - 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; + if ((pmap[y][x]&0xFF)==PT_DLAY) { + parts[pmap[y][x]>>8].type = PT_SPRK; + parts[pmap[y][x]>>8].life = (int)parts[pmap[y][x]>>8].temp; + 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; } 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) 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 if (t==PT_PHOT||t==PT_NEUT) photons[y][x] = t|(i<<8); |