diff options
| author | Simon Robertshaw <simon@hardwired.org.uk> | 2011-12-19 14:29:01 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2011-12-19 14:29:01 (GMT) |
| commit | d6953be3a8271785b5912f3105f3ca92cc17aaae (patch) | |
| tree | 0b6f0fdc504809d0c2202742176c5d02baff3874 /src/elements/bomb.c | |
| parent | 3812034d2b1c6e3c3f28479ca7c9570adcec7a87 (diff) | |
| download | powder-d6953be3a8271785b5912f3105f3ca92cc17aaae.zip powder-d6953be3a8271785b5912f3105f3ca92cc17aaae.tar.gz | |
New element: Ignition cord
Diffstat (limited to 'src/elements/bomb.c')
| -rw-r--r-- | src/elements/bomb.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/elements/bomb.c b/src/elements/bomb.c index ee45624..ae51810 100644 --- a/src/elements/bomb.c +++ b/src/elements/bomb.c @@ -2,6 +2,7 @@ int update_BOMB(UPDATE_FUNC_ARGS) { int r, rx, ry, nb; + //Spark is used so much now that it should be a seperate element. if (parts[i].tmp==1) { for (rx=-1; rx<2; rx++) for (ry=-1; ry<2; ry++) @@ -10,7 +11,7 @@ int update_BOMB(UPDATE_FUNC_ARGS) { r = pmap[y+ry][x+rx]; if (!r) continue; - if (ptypes[r&0xFF].properties & (TYPE_SOLID | TYPE_PART | TYPE_LIQUID) && (r&0xFF)!=PT_BOMB) { + if (ptypes[r&0xFF].properties & (TYPE_SOLID | TYPE_PART | TYPE_LIQUID) && !(ptypes[r&0xFF].properties & PROP_SPARKSETTLE)) { kill_part(i); return 1; } |