summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSimon Robertshaw <simon@hardwired.org.uk>2011-07-27 12:07:05 (GMT)
committer Simon Robertshaw <simon@hardwired.org.uk>2011-07-27 12:07:05 (GMT)
commit6fbf48f2e674ccbdb280a4e87e7ee40bb7c2bad6 (patch)
tree415d8056df1ef769f0d139b7b88c7ed90b3cf40a /src
parent0f585011fb98190f58a6afbf8bdb289171e714fe (diff)
downloadpowder-6fbf48f2e674ccbdb280a4e87e7ee40bb7c2bad6.zip
powder-6fbf48f2e674ccbdb280a4e87e7ee40bb7c2bad6.tar.gz
Revert "DLAY temp, actually fixed :D"
This reverts commit 94e316af854932ddd8f60b011de936000f10fac4.
Diffstat (limited to 'src')
-rw-r--r--src/powder.c16
1 files changed, 6 insertions, 10 deletions
diff --git a/src/powder.c b/src/powder.c
index c825210..447f3fd 100644
--- a/src/powder.c
+++ b/src/powder.c
@@ -713,16 +713,10 @@ 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;
- 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;
- }
+ 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)
@@ -990,6 +984,8 @@ 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);