diff options
| author | Simon Robertshaw <simon@hardwired.org.uk> | 2011-10-28 23:11:27 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2011-10-28 23:11:27 (GMT) |
| commit | a7191ce9e7621a4cbded534b17246cd910db6734 (patch) | |
| tree | 8fe36dbeea8c449efa5b8c027b3a5c66744a1cec /src | |
| parent | e46f26684bfbe82734ad4716e45ebb1a94075a69 (diff) | |
| download | powder-a7191ce9e7621a4cbded534b17246cd910db6734.zip powder-a7191ce9e7621a4cbded534b17246cd910db6734.tar.gz | |
Whoops, fix PMODE_BLEND to use correct function, also fix BRAY del mode
Diffstat (limited to 'src')
| -rw-r--r-- | src/elements/newgraphics.c | 6 | ||||
| -rw-r--r-- | src/graphics.c | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/elements/newgraphics.c b/src/elements/newgraphics.c index 23c660f..7eb1dcc 100644 --- a/src/elements/newgraphics.c +++ b/src/elements/newgraphics.c @@ -222,6 +222,8 @@ int graphics_INVS(GRAPHICS_FUNC_ARGS) *colr = 15; *colg = 0; *colb = 150; + *pixel_mode &= PMODE; + *pixel_mode |= PMODE_BLEND; } return 0; } @@ -310,8 +312,8 @@ int graphics_BRAY(GRAPHICS_FUNC_ARGS) trans = cpart->life*100; if (trans>255) trans = 255; *colr = 255; - *colr = 150; - *colr = 50; + *colg = 150; + *colb = 50; } *cola = trans; *pixel_mode &= ~PMODE; diff --git a/src/graphics.c b/src/graphics.c index 7dcf130..9316cae 100644 --- a/src/graphics.c +++ b/src/graphics.c @@ -1896,7 +1896,7 @@ void render_parts(pixel *vid) flatC[cflatC++] = ((float)cola)/255.0f; cflat++; #else - addpixel(vid, nx, ny, colr, colg, colb, cola); + blendpixel(vid, nx, ny, colr, colg, colb, cola); #endif } if(pixel_mode & PMODE_ADD) |