summaryrefslogtreecommitdiff
path: root/src/elements/fwrk.c
diff options
context:
space:
mode:
authorSimon <simon@hardwired.org.uk>2011-02-04 10:24:35 (GMT)
committer Simon <simon@hardwired.org.uk>2011-02-04 10:24:35 (GMT)
commit9469a3b46a80970fc1d2a11df8c8692de90b6c00 (patch)
treeac8069712226ab150076c3af32cd2b1ab3a71d7b /src/elements/fwrk.c
parent525a59e28011cf26993c8e3f040a36ba7b7bf5e2 (diff)
parent9064cabf288be8ecb2fbc1c15bb4071cf3df1c22 (diff)
downloadpowder-9469a3b46a80970fc1d2a11df8c8692de90b6c00.zip
powder-9469a3b46a80970fc1d2a11df8c8692de90b6c00.tar.gz
Merge with cracker, also fix version
Diffstat (limited to 'src/elements/fwrk.c')
-rw-r--r--src/elements/fwrk.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/elements/fwrk.c b/src/elements/fwrk.c
index def28e4..06390c5 100644
--- a/src/elements/fwrk.c
+++ b/src/elements/fwrk.c
@@ -7,9 +7,9 @@ int update_FWRK(UPDATE_FUNC_ARGS) {
np = create_part(-1, x , y-1 , PT_FWRK);
if (np!=-1)
{
- parts[r>>8].vy = rand()%8-22;
- parts[r>>8].vx = rand()%20-rand()%20;
- parts[r>>8].life=rand()%15+25;
+ parts[np].vy = rand()%8-22;
+ parts[np].vx = rand()%20-rand()%20;
+ parts[np].life=rand()%15+25;
kill_part(i);
return 1;
}
@@ -33,13 +33,13 @@ int update_FWRK(UPDATE_FUNC_ARGS) {
pv[y/CELL][x/CELL] += 2.00f*CFDS;
if (np!=-1)
{
- parts[r>>8].vy = -(rand()%10-1);
- parts[r>>8].vx = ((rand()%2)*2-1)*rand()%(5+5)+(parts[i].vx)*2 ;
- parts[r>>8].life= rand()%37+18;
- parts[r>>8].tmp=q;
- parts[r>>8].flags=w;
- parts[r>>8].ctype=e;
- parts[r>>8].temp= rand()%20+6000;
+ parts[np].vy = -(rand()%10-1);
+ parts[np].vx = ((rand()%2)*2-1)*rand()%(5+5)+(parts[i].vx)*2 ;
+ parts[np].life= rand()%37+18;
+ parts[np].tmp=q;
+ parts[np].flags=w;
+ parts[np].ctype=e;
+ parts[np].temp= rand()%20+6000;
}
}
}