summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/graphics/Renderer.cpp10
-rw-r--r--src/simulation/elements/WARP.cpp2
2 files changed, 9 insertions, 3 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)
{
diff --git a/src/simulation/elements/WARP.cpp b/src/simulation/elements/WARP.cpp
index bb8f8e1..5dd19c5 100644
--- a/src/simulation/elements/WARP.cpp
+++ b/src/simulation/elements/WARP.cpp
@@ -43,7 +43,7 @@ Element_WARP::Element_WARP()
HighTemperatureTransition = NT;
Update = &Element_WARP::update;
-
+ Graphics = &Element_WARP::graphics;
}
//#TPT-Directive ElementHeader Element_WARP static int update(UPDATE_FUNC_ARGS)