diff options
| author | jacksonmj <mj-pt@jacksonmj.co.uk> | 2011-08-18 12:44:09 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2011-08-19 11:23:38 (GMT) |
| commit | 961a393c7a20166277c10aebde43e7563951773a (patch) | |
| tree | 835f2ba00af186cd8577ad0edbecf2569700a4b9 /src/graphics.c | |
| parent | 34abbcc84ccbefac065a8c7afd62ce272b3e51ec (diff) | |
| download | powder-961a393c7a20166277c10aebde43e7563951773a.zip powder-961a393c7a20166277c10aebde43e7563951773a.tar.gz | |
Modify GBMB to only use life
tmp not needed, since it doesn't create powder during an explosion like BOMB does.
Diffstat (limited to 'src/graphics.c')
| -rw-r--r-- | src/graphics.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/graphics.c b/src/graphics.c index 6225c6f..233a178 100644 --- a/src/graphics.c +++ b/src/graphics.c @@ -3255,7 +3255,7 @@ void draw_parts(pixel *vid) } else if (t==PT_GBMB) { - if (parts[i].tmp==0) { + if (parts[i].life<=0) {//not yet detonated cr = PIXR(ptypes[t].pcolors); cg = PIXG(ptypes[t].pcolors); cb = PIXB(ptypes[t].pcolors); @@ -3285,7 +3285,7 @@ void draw_parts(pixel *vid) blendpixel(vid, nx, ny, cr, cg, cb, 255); } } - else if (parts[i].tmp==1) { + else {//exploding cr = PIXR(ptypes[t].pcolors); cg = PIXG(ptypes[t].pcolors); cb = PIXB(ptypes[t].pcolors); @@ -3305,10 +3305,6 @@ void draw_parts(pixel *vid) blendpixel(vid, nx, ny, cr, cg, cb, 255); } } - else { - blendpixel(vid, nx, ny, 255, 255, 255, 255); - } - } else if (ptypes[t].properties&PROP_HOT_GLOW && parts[i].temp>(ptransitions[t].thv-800.0f)) { |