matthew/The-Powder-Toy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Whoops, fix PMODE_BLEND to use correct function, also fix BRAY del mode

Browse Source
This commit is contained in:
Simon Robertshaw 2011-10-29 00:11:27 +01:00
parent e46f26684b
commit a7191ce9e7
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/elements/newgraphics.c
View File

@ -222,6 +222,8 @@ int graphics_INVS(GRAPHICS_FUNC_ARGS)
*colr = 15; *colr = 15;
*colg = 0; *colg = 0;
*colb = 150; *colb = 150;
*pixel_mode &= PMODE;
*pixel_mode |= PMODE_BLEND;
} }
return 0; return 0;
} }
@ -310,8 +312,8 @@ int graphics_BRAY(GRAPHICS_FUNC_ARGS)
trans = cpart->life*100; trans = cpart->life*100;
if (trans>255) trans = 255; if (trans>255) trans = 255;
*colr = 255; *colr = 255;
*colr = 150; *colg = 150;
*colr = 50; *colb = 50;
} }
*cola = trans; *cola = trans;
*pixel_mode &= ~PMODE; *pixel_mode &= ~PMODE;

2
src/graphics.c
View File

@ -1896,7 +1896,7 @@ void render_parts(pixel *vid)
flatC[cflatC++] = ((float)cola)/255.0f; flatC[cflatC++] = ((float)cola)/255.0f;
cflat++; cflat++;
#else #else
addpixel(vid, nx, ny, colr, colg, colb, cola); blendpixel(vid, nx, ny, colr, colg, colb, cola);
#endif #endif
} }
if(pixel_mode & PMODE_ADD) if(pixel_mode & PMODE_ADD)