diff options
| author | Simon <simon@hardwired.org.uk> | 2011-01-05 20:36:09 (GMT) |
|---|---|---|
| committer | Simon <simon@hardwired.org.uk> | 2011-01-05 20:36:09 (GMT) |
| commit | a46a484f2eececfb79bd7f5dd2e3456eeb77c192 (patch) | |
| tree | 4c3c5ac6bd4a3848f151257fb5ca17bb26005207 /src/graphics.c | |
| parent | e2d4ae576355626ea07aa83db817bd0104dd7e6c (diff) | |
| download | powder-a46a484f2eececfb79bd7f5dd2e3456eeb77c192.zip powder-a46a484f2eececfb79bd7f5dd2e3456eeb77c192.tar.gz | |
Fix acid drawing and 'purple acid'
Diffstat (limited to 'src/graphics.c')
| -rw-r--r-- | src/graphics.c | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/src/graphics.c b/src/graphics.c index 73a8f59..525f0bb 100644 --- a/src/graphics.c +++ b/src/graphics.c @@ -1934,13 +1934,21 @@ void draw_parts(pixel *vid) } else if(t==PT_ACID) { - if(parts[i].life>255) parts[i].life = 255; - if(parts[i].life<47) parts[i].life = 48; - s = (255/((parts[i].life-46)*28)); + if(parts[i].life>75) parts[i].life = 75; + if(parts[i].life<49) parts[i].life = 49; + s = (parts[i].life-49)*3; if(s==0) s = 1; - cr = PIXR(ptypes[t].pcolors)/s; - cg = PIXG(ptypes[t].pcolors)/s; - cb = PIXB(ptypes[t].pcolors)/s; + cr = 0x86 + s*4; + cg = 0x36 + s*1; + cb = 0x90 + s*2; + + if(cr>=255) + cr = 255; + if(cg>=255) + cg = 255; + if(cb>=255) + cb = 255; + blendpixel(vid, nx, ny, cr, cg, cb, 255); if(cmode==CM_BLOB) |