summaryrefslogtreecommitdiff
path: root/src/graphics.c
diff options
context:
space:
mode:
authorSimon Robertshaw <simon@hardwired.org.uk>2011-10-28 21:36:37 (GMT)
committer Simon Robertshaw <simon@hardwired.org.uk>2011-10-28 21:36:37 (GMT)
commit7413654b9f1d6c0cde622d1b3129378a8e6c30d2 (patch)
tree97b44bfb8fe17e4bf792d3336f61b840b327962b /src/graphics.c
parent41448e92bf0ea299250a1319204aeab0f7ef3bcc (diff)
downloadpowder-7413654b9f1d6c0cde622d1b3129378a8e6c30d2.zip
powder-7413654b9f1d6c0cde622d1b3129378a8e6c30d2.tar.gz
Fix Blob mode, Sprk, Firw, Fwrk and others
Diffstat (limited to 'src/graphics.c')
-rw-r--r--src/graphics.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/src/graphics.c b/src/graphics.c
index abfe3cb..f4e1e50 100644
--- a/src/graphics.c
+++ b/src/graphics.c
@@ -1769,9 +1769,12 @@ void render_parts(pixel *vid)
}
//Apply decoration colour
- colr = (deca*decr + (255-deca)*colr) >> 8;
- colg = (deca*decg + (255-deca)*colg) >> 8;
- colb = (deca*decb + (255-deca)*colb) >> 8;
+ if(cmode != CM_NOTHING && decorations_enable)
+ {
+ colr = (deca*decr + (255-deca)*colr) >> 8;
+ colg = (deca*decg + (255-deca)*colg) >> 8;
+ colb = (deca*decb + (255-deca)*colb) >> 8;
+ }
//All colours are now set, check ranges
if(colr>255) colr = 255;
@@ -1873,6 +1876,8 @@ void render_parts(pixel *vid)
blobC[cblobC++] = 1.0f;
cblob++;
#else
+ vid[ny*(XRES+BARSIZE)+nx] = PIXRGB(colr,colg,colb);
+
blendpixel(vid, nx+1, ny, colr, colg, colb, 223);
blendpixel(vid, nx-1, ny, colr, colg, colb, 223);
blendpixel(vid, nx, ny+1, colr, colg, colb, 223);