summaryrefslogtreecommitdiff
path: root/src/graphics.c
diff options
context:
space:
mode:
authorSimon Robertshaw <simon@hardwired.org.uk>2011-11-13 21:02:46 (GMT)
committer Simon Robertshaw <simon@hardwired.org.uk>2011-11-13 21:02:46 (GMT)
commitc63dff45e4e59ac14c0a087388b89e0d08fa5a62 (patch)
tree50f2791205200202f1d2a991cd530e207b572180 /src/graphics.c
parent0f4c0915d9bdfbd9e865200941083bd463d03d69 (diff)
downloadpowder-c63dff45e4e59ac14c0a087388b89e0d08fa5a62.zip
powder-c63dff45e4e59ac14c0a087388b89e0d08fa5a62.tar.gz
Basic render modes for Render_ui
Diffstat (limited to 'src/graphics.c')
-rw-r--r--src/graphics.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/graphics.c b/src/graphics.c
index 7c4af56..3e889ad 100644
--- a/src/graphics.c
+++ b/src/graphics.c
@@ -69,8 +69,8 @@ float plasma_data_pos[] = {1.0f, 0.9f, 0.5f, 0.25, 0.0f};
void init_display_modes()
{
int i;
- display_modes = calloc(sizeof(unsigned int), 1);
- render_modes = calloc(sizeof(unsigned int), 2);
+ display_modes = calloc(1, sizeof(unsigned int));
+ render_modes = calloc(2, sizeof(unsigned int));
display_modes[0] = 0;
render_modes[0] = RENDER_FIRE;
@@ -1846,6 +1846,10 @@ void render_parts(pixel *vid)
pixel_mode |= PMODE_GLOW;
if(pixel_mode & FIRE_BLEND && !(render_mode & FIRE_BLEND))
pixel_mode |= PMODE_BLUR;
+ if(pixel_mode & PMODE_BLUR && !(render_mode & PMODE_BLUR))
+ pixel_mode |= PMODE_FLAT;
+ if(pixel_mode & PMODE_GLOW && !(render_mode & PMODE_GLOW))
+ pixel_mode |= PMODE_FLAT;
pixel_mode &= render_mode;