diff options
| author | Simon Robertshaw <simon@hardwired.org.uk> | 2012-03-15 01:52:23 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2012-03-15 01:52:23 (GMT) |
| commit | 7a454d4d729a5715a7c1e71dfbaf303471bf8d1f (patch) | |
| tree | 234cb5ba80e5227ecc5dc7c7e9b4845444e5f1a9 /src/elements/sprk.c | |
| parent | b4a06df0b2264c690f0161b099c2c5a2c11f8b3b (diff) | |
| parent | bf5484ca63f0ee5165b394f98d91e16089f657a2 (diff) | |
| download | powder-7a454d4d729a5715a7c1e71dfbaf303471bf8d1f.zip powder-7a454d4d729a5715a7c1e71dfbaf303471bf8d1f.tar.gz | |
Merge pull request #57 from jacob1/test
Bug fixes + Some stuff from jacob1's mod
Diffstat (limited to 'src/elements/sprk.c')
| -rw-r--r-- | src/elements/sprk.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/elements/sprk.c b/src/elements/sprk.c index 67b8132..00279f5 100644 --- a/src/elements/sprk.c +++ b/src/elements/sprk.c @@ -44,7 +44,7 @@ int update_SPRK(UPDATE_FUNC_ARGS) { parts[nearp].ctype = PT_ETRD; } } - else if (ct==PT_NBLE&&parts[i].life<=1) + else if (ct==PT_NBLE&&parts[i].life<=1&&parts[i].tmp!=1) { parts[i].life = rand()%150+50; part_change_type(i,x,y,PT_PLSM); @@ -179,6 +179,8 @@ int update_SPRK(UPDATE_FUNC_ARGS) { conduct_sprk = 0; if (rt==PT_INST&&ct!=PT_PSCN) conduct_sprk = 0; + if (rt == PT_NBLE && parts[r>>8].tmp == 1) + conduct_sprk = 0; if (conduct_sprk) { if (rt==PT_WATR||rt==PT_SLTW) { @@ -221,9 +223,9 @@ int graphics_SPRK(GRAPHICS_FUNC_ARGS) { *firea = 80; - *firer = *colr = 170; - *fireg = *colg = 200; - *fireb = *colb = 220; + *firer = 170; + *fireg = 200; + *fireb = 220; //*pixel_mode |= FIRE_ADD; *pixel_mode |= FIRE_ADD; return 1; |