diff options
| author | jacksonmj <jacksonmj@jacksonmj.none> | 2011-01-11 13:44:52 (GMT) |
|---|---|---|
| committer | jacksonmj <jacksonmj@jacksonmj.none> | 2011-01-11 13:44:52 (GMT) |
| commit | 4006bdf4c22564e916092d6d63ae63d1fa6bc5b5 (patch) | |
| tree | 5cbe9ad22685a055f4d7849bd52afa0f9ab87f8d /src/graphics.c | |
| parent | cf1ef725847a5dc5c9e796a10ff840f65dc1e885 (diff) | |
| parent | b3735bb84b5d53014e7e20085007ef380cc7a3c1 (diff) | |
| download | powder-4006bdf4c22564e916092d6d63ae63d1fa6bc5b5.zip powder-4006bdf4c22564e916092d6d63ae63d1fa6bc5b5.tar.gz | |
Merge branch 'upstream' into dev
Diffstat (limited to 'src/graphics.c')
| -rw-r--r-- | src/graphics.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/graphics.c b/src/graphics.c index ab7cc31..6c0123f 100644 --- a/src/graphics.c +++ b/src/graphics.c @@ -1478,7 +1478,12 @@ void draw_parts(pixel *vid) cb = 0; blendpixel(vid, nx, ny, cr, cg, cb, 255); } - else if (cmode==CM_FANCY) + else if (cmode==CM_FANCY && + t!=PT_FIRE && t!=PT_PLSM && t!=PT_WTRV && + t!=PT_HFLM && t!=PT_SPRK && t!=PT_FIRW && + t!=PT_DUST && t!=PT_FIRW && t!=PT_FWRK && + t!=PT_NEUT && t!=PT_LAVA && t!=PT_BOMB && + t!=PT_PHOT && t!=PT_THDR && t!=PT_SMKE) { if (ptypes[parts[i].type].properties&TYPE_LIQUID) { |