From a7191ce9e7621a4cbded534b17246cd910db6734 Mon Sep 17 00:00:00 2001
From: Simon Robertshaw <simon@hardwired.org.uk>
Date: Sat, 29 Oct 2011 00:11:27 +0100
Subject: [PATCH] Whoops, fix PMODE_BLEND to use correct function, also fix
 BRAY del mode

---
 src/elements/newgraphics.c | 6 ++++--
 src/graphics.c             | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/elements/newgraphics.c b/src/elements/newgraphics.c
index 23c660f44..7eb1dcc66 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 7dcf13044..9316caecc 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)