diff options
| author | jacksonmj <mj-pt@jacksonmj.co.uk> | 2012-06-20 20:45:33 (GMT) |
|---|---|---|
| committer | jacksonmj <mj-pt@jacksonmj.co.uk> | 2012-06-20 21:15:45 (GMT) |
| commit | 1d5b08194291db72c05e68eed592e8fcb6101c63 (patch) | |
| tree | 39945df4b183ef2bbcaf0cc1432a3a02b547f5f6 /src/powder.c | |
| parent | 9b2c2a78a6f4ba4fb13f04f17a649caeaf416d8d (diff) | |
| download | powder-1d5b08194291db72c05e68eed592e8fcb6101c63.zip powder-1d5b08194291db72c05e68eed592e8fcb6101c63.tar.gz | |
Replace all explosion sparks with new element (EMBR)
Replaces: BOMB sparks and flash, electrons + glass sparks, sparks from
IGNC, sparks from TNT explosion, and sparks from FWRK and FIRW.
Diffstat (limited to 'src/powder.c')
| -rw-r--r-- | src/powder.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/powder.c b/src/powder.c index 9dd2fd1..fd01dd6 100644 --- a/src/powder.c +++ b/src/powder.c @@ -184,6 +184,7 @@ void init_can_move() can_move[PT_ANAR][PT_WHOL] = 1; can_move[PT_ANAR][PT_NWHL] = 1; can_move[PT_THDR][PT_THDR] = 2; + can_move[PT_EMBR][PT_EMBR] = 2; } /* @@ -254,9 +255,6 @@ int try_move(int i, int x, int y, int nx, int ny) e = eval_move(parts[i].type, nx, ny, &r); - if ((r&0xFF)==PT_BOMB && parts[i].type==PT_BOMB && parts[i].tmp == 1) - e = 2; - /* half-silvered mirror */ if (!e && parts[i].type==PT_PHOT && (((r&0xFF)==PT_BMTL && rand()<RAND_MAX/2) || @@ -1033,6 +1031,9 @@ inline int create_part(int p, int x, int y, int tv)//the function for creating a parts[i].life = 1000; parts[i].tmp = 244; break; + case PT_EMBR: + parts[i].life = 50; + break; case PT_STKM: if (player.spwn==0) { @@ -2870,7 +2871,7 @@ void update_particles(pixel *vid)//doesn't update the particles themselves, but pmap[y][x] = t|(i<<8); // Count number of particles at each location, for excess stacking check // (does not include energy particles or THDR - currently no limit on stacking those) - if (t!=PT_THDR) + if (t!=PT_THDR && t!=PT_EMBR) pmap_count[y][x]++; } } |