summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorjacksonmj <mj-pt@jacksonmj.co.uk>2011-05-28 23:51:51 (GMT)
committer Simon Robertshaw <simon@hardwired.org.uk>2011-05-29 12:38:39 (GMT)
commit7750cf8ccd01643d24af1e5b8b275ed6a1b15f7e (patch)
treeadd5e2c3a984bbbc1cd5d9bef14941efa3baf09a /src
parentf603e33e74f82fa14bb6747a43773a8b47ceaa3c (diff)
downloadpowder-7750cf8ccd01643d24af1e5b8b275ed6a1b15f7e.zip
powder-7750cf8ccd01643d24af1e5b8b275ed6a1b15f7e.tar.gz
Improve decoration in blob view, exclude from life and heat view
Diffstat (limited to 'src')
-rw-r--r--src/graphics.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/graphics.c b/src/graphics.c
index df94f78..94c043f 100644
--- a/src/graphics.c
+++ b/src/graphics.c
@@ -3060,6 +3060,13 @@ void draw_parts(pixel *vid)
// blendpixel(vid, nx, ny-1, R, G, B, 46);
//}
+ if (decorations_enable && parts[i].dcolour)
+ {
+ int a = (parts[i].dcolour>>24)&0xFF;
+ cr = (a*((parts[i].dcolour>>16)&0xFF) + (255-a)*cr) >> 8;
+ cg = (a*((parts[i].dcolour>>8)&0xFF) + (255-a)*cg) >> 8;
+ cb = (a*((parts[i].dcolour)&0xFF) + (255-a)*cb) >> 8;
+ }
blendpixel(vid, nx+1, ny, cr, cg, cb, 223);
blendpixel(vid, nx-1, ny, cr, cg, cb, 223);
blendpixel(vid, nx, ny+1, cr, cg, cb, 223);
@@ -3070,7 +3077,7 @@ void draw_parts(pixel *vid)
blendpixel(vid, nx+1, ny+1, cr, cg, cb, 112);
blendpixel(vid, nx-1, ny+1, cr, cg, cb, 112);
}
- if (decorations_enable)
+ if (decorations_enable && cmode!=CM_HEAT && cmode!=CM_LIFE && parts[i].dcolour)
blendpixel(vid, nx, ny, (parts[i].dcolour>>16)&0xFF, (parts[i].dcolour>>8)&0xFF, (parts[i].dcolour)&0xFF, (parts[i].dcolour>>24)&0xFF);
}
#endif