diff options
| author | Bryan Hoyle <starfoxprime@gmail.com> | 2011-08-24 00:29:26 (GMT) |
|---|---|---|
| committer | Bryan Hoyle <starfoxprime@gmail.com> | 2011-08-24 00:29:26 (GMT) |
| commit | 578144c48a1b35ae8d0763637752d935169663ac (patch) | |
| tree | ad0407b144aca61502e8419c96fc385a9f5aea28 /src/elements/sprk.c | |
| parent | f577c319db982e6b3d3b3731f1980c89182da982 (diff) | |
| parent | 6581c29bf7eaf07483178804199f090b1c0e43ff (diff) | |
| download | powder-578144c48a1b35ae8d0763637752d935169663ac.zip powder-578144c48a1b35ae8d0763637752d935169663ac.tar.gz | |
Merge remote branch 'origin/master'
Diffstat (limited to 'src/elements/sprk.c')
| -rw-r--r-- | src/elements/sprk.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/elements/sprk.c b/src/elements/sprk.c index 039453f..0f3d8e9 100644 --- a/src/elements/sprk.c +++ b/src/elements/sprk.c @@ -35,7 +35,7 @@ int update_SPRK(UPDATE_FUNC_ARGS) { nearp = nearest_part(i, PT_ETRD); if (nearp!=-1&&parts_avg(i, nearp, PT_INSL)!=PT_INSL) { - create_line(x, y, (int)(parts[nearp].x+0.5f), (int)(parts[nearp].y+0.5f), 0, 0, PT_PLSM); + create_line(x, y, (int)(parts[nearp].x+0.5f), (int)(parts[nearp].y+0.5f), 0, 0, PT_PLSM, 0); part_change_type(i,x,y,ct); ct = parts[i].ctype = PT_NONE; parts[i].life = 20; @@ -152,7 +152,7 @@ int update_SPRK(UPDATE_FUNC_ARGS) { else if (rt==PT_INST) { if (parts[i].life>=3&&parts[r>>8].life==0) { - flood_parts(x+rx,y+ry,PT_SPRK,PT_INST,-1);//spark the wire + flood_parts(x+rx,y+ry,PT_SPRK,PT_INST,-1, 0);//spark the wire } } else if (parts[r>>8].life==0 && (parts[i].life<3 || ((r>>8)<i && parts[i].life<4))) { |