summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSimon Robertshaw <simon@hardwired.org.uk>2011-10-29 14:55:42 (GMT)
committer Simon Robertshaw <simon@hardwired.org.uk>2011-10-29 14:55:42 (GMT)
commitf4b6cbf34d1163acfc70bb26a1d84fc5254cfd22 (patch)
treee5be71e7f28cc34f3b2f919b282f18a7f30c692d /src
parent52fd083db4c3e3b7ef7e657f4fc4d8dd87c6c421 (diff)
downloadpowder-f4b6cbf34d1163acfc70bb26a1d84fc5254cfd22.zip
powder-f4b6cbf34d1163acfc70bb26a1d84fc5254cfd22.tar.gz
Fix passing of PMODE_GLOW into Heat display
Diffstat (limited to 'src')
-rw-r--r--src/graphics.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/graphics.c b/src/graphics.c
index 4637eaa..e9848a1 100644
--- a/src/graphics.c
+++ b/src/graphics.c
@@ -1738,7 +1738,7 @@ void render_parts(pixel *vid)
fireg = colg = (unsigned char)color_data[caddress+1];
fireb = colb = (unsigned char)color_data[caddress+2];
cola = 255;
- if(pixel_mode & (FIRE_ADD | FIRE_BLEND)) pixel_mode = (pixel_mode & ~FIRE_ADD) | PMODE_BLUR | PMODE_FLAT;
+ if(pixel_mode & (FIRE_ADD | FIRE_BLEND | PMODE_GLOW)) pixel_mode = (pixel_mode & ~(FIRE_ADD|FIRE_BLEND|PMODE_GLOW)) | PMODE_BLUR | PMODE_FLAT;
break;
case CM_LIFE:
gradv = 0.4f;