summaryrefslogtreecommitdiff
path: root/src/graphics/Renderer.cpp
diff options
context:
space:
mode:
authorjacob1 <jfu614@gmail.com>2012-12-18 00:41:32 (GMT)
committer jacob1 <jfu614@gmail.com>2012-12-18 01:08:46 (GMT)
commit2728cf852b41d6b015582bb4ad95772be58b277b (patch)
tree04786972c7fce7cc66cd8f469bc87a6d37f9df13 /src/graphics/Renderer.cpp
parentf08481a88e083c4cda2465dd74bf442915c395ae (diff)
downloadpowder-2728cf852b41d6b015582bb4ad95772be58b277b.zip
powder-2728cf852b41d6b015582bb4ad95772be58b277b.tar.gz
fix WARP being invisible, make it visible in heat display mode though
Diffstat (limited to 'src/graphics/Renderer.cpp')
-rw-r--r--src/graphics/Renderer.cpp10
1 files changed, 8 insertions, 2 deletions
diff --git a/src/graphics/Renderer.cpp b/src/graphics/Renderer.cpp
index eaec74c..98b94b1 100644
--- a/src/graphics/Renderer.cpp
+++ b/src/graphics/Renderer.cpp
@@ -1217,7 +1217,10 @@ void Renderer::render_parts()
fireg = colg = (unsigned char)color_data[caddress+1];
fireb = colb = (unsigned char)color_data[caddress+2];
cola = 255;
- if(pixel_mode & (FIREMODE | PMODE_GLOW)) pixel_mode = (pixel_mode & ~(FIREMODE|PMODE_GLOW)) | PMODE_BLUR;
+ if(pixel_mode & (FIREMODE | PMODE_GLOW))
+ pixel_mode = (pixel_mode & ~(FIREMODE|PMODE_GLOW)) | PMODE_BLUR;
+ else if (!pixel_mode)
+ pixel_mode |= PMODE_FLAT;
}
else if(colour_mode & COLOUR_LIFE)
{
@@ -1228,7 +1231,10 @@ void Renderer::render_parts()
q = sim->parts[i].life;
colr = colg = colb = sin(gradv*q) * 100 + 128;
cola = 255;
- if(pixel_mode & (FIREMODE | PMODE_GLOW)) pixel_mode = (pixel_mode & ~(FIREMODE|PMODE_GLOW)) | PMODE_BLUR;
+ if(pixel_mode & (FIREMODE | PMODE_GLOW))
+ pixel_mode = (pixel_mode & ~(FIREMODE|PMODE_GLOW)) | PMODE_BLUR;
+ else if (!pixel_mode)
+ pixel_mode |= PMODE_FLAT;
}
else if(colour_mode & COLOUR_BASC)
{