diff options
| author | Cracker64 <cracker642@gmail.com> | 2010-12-08 17:14:02 (GMT) |
|---|---|---|
| committer | Cracker64 <cracker642@gmail.com> | 2010-12-08 17:14:02 (GMT) |
| commit | cbf41389a2ac611c4829e08ede525ee4076d92d7 (patch) | |
| tree | e7e7487fec95953e46ebde3e8c77931f076e61df /src/graphics.c | |
| parent | fff7ecedf811e487efdb0a65012a3502915d3cb2 (diff) | |
| download | powder-cbf41389a2ac611c4829e08ede525ee4076d92d7.zip powder-cbf41389a2ac611c4829e08ede525ee4076d92d7.tar.gz | |
Bugfix for wifi, would cause a double spark if timed just right. updated to
Diffstat (limited to 'src/graphics.c')
| -rw-r--r-- | src/graphics.c | 83 |
1 files changed, 81 insertions, 2 deletions
diff --git a/src/graphics.c b/src/graphics.c index dffcc7c..9b89f79 100644 --- a/src/graphics.c +++ b/src/graphics.c @@ -1402,12 +1402,35 @@ void draw_parts(pixel *vid) isplayer = 1; //It's a secret. Tssss... } - if(cmode==CM_NOTHING && t!=PT_PIPE && t!=PT_SWCH && t!=PT_LCRY && t!=PT_PUMP)//nothing display but show needed color changes + if(cmode==CM_NOTHING && t!=PT_PIPE && t!=PT_SWCH && t!=PT_LCRY && t!=PT_PUMP && t!=PT_FILT)//nothing display but show needed color changes { + if(t==PT_PHOT) + { + cg = 0; + cb = 0; + cr = 0; + for(x=0; x<12; x++) { + cr += (parts[i].ctype >> (x+18)) & 1; + cb += (parts[i].ctype >> x) & 1; + } + for(x=0; x<14; x++) + cg += (parts[i].ctype >> (x+9)) & 1; + x = 624/(cr+cg+cb+1); + cr *= x; + cg *= x; + cb *= x; + cr = cr>255?255:cr; + cg = cg>255?255:cg; + cb = cb>255?255:cb; + blendpixel(vid, nx, ny, cr, cg, cb, 255); + } + else + { cr = PIXR(ptypes[t].pcolors); cg = PIXG(ptypes[t].pcolors); cb = PIXB(ptypes[t].pcolors); blendpixel(vid, nx, ny, cr, cg, cb, 255); + } } else if(cmode==CM_GRAD)//forgot to put else, broke nothing view { @@ -1789,6 +1812,21 @@ void draw_parts(pixel *vid) cb = cb>255?255:cb; blendpixel(vid, nx, ny, cr, cg, cb, 127); } + else if(t==PT_BRAY && parts[i].tmp==0) + { + int trans = parts[i].life * 7; + blendpixel(vid, nx, ny, PIXR(ptypes[t].pcolors), PIXG(ptypes[t].pcolors), PIXB(ptypes[t].pcolors), trans); + } + else if(t==PT_BRAY && parts[i].tmp==1) + { + int trans = parts[i].life/4; + blendpixel(vid, nx, ny, PIXR(ptypes[t].pcolors), PIXG(ptypes[t].pcolors), PIXB(ptypes[t].pcolors), trans); + } + else if(t==PT_BRAY && parts[i].tmp==2) + { + int trans = parts[i].life*100; + blendpixel(vid, nx, ny, 255, 150, 50, trans); + } else if(t==PT_PHOT) { if(cmode == CM_FIRE||cmode==CM_BLOB || cmode==CM_FANCY) @@ -2805,6 +2843,47 @@ pixel *prerender_save(void *save, int size, int *width, int *height) else fb[(ry+j)*w+(rx+i)] = PIXPACK(0x808080); break; + case WL_WALL: + for(j=0; j<CELL; j++) + for(i=0; i<CELL; i++) + fb[(ry+j)*w+(rx+i)] = PIXPACK(0x808080); + break; + case WL_DESTROYALL: + for(j=0; j<CELL; j+=2) + for(i=(j>>1)&1; i<CELL; i+=2) + fb[(ry+j)*w+(rx+i)] = PIXPACK(0x808080); + break; + case WL_ALLOWLIQUID: + for(j=0; j<CELL; j++) + for(i=0; i<CELL; i++) + if(!(j%2) && !(i%2)) + fb[(ry+j)*w+(rx+i)] = PIXPACK(0xC0C0C0); + break; + case WL_STREAM: + for(j=0; j<CELL; j+=2) + for(i=(j>>1)&1; i<CELL; i+=2) + fb[(ry+j)*w+(rx+i)] = PIXPACK(0x8080FF); + k++; + break; + case WL_DETECT: + for(j=0; j<CELL; j+=2) + for(i=(j>>1)&1; i<CELL; i+=2) + fb[(ry+j)*w+(rx+i)] = PIXPACK(0xFF8080); + break; + case WL_EWALL: + for(j=0; j<CELL; j++) + for(i=0; i<CELL; i++) + if(!(i&j&1)) + fb[(ry+j)*w+(rx+i)] = PIXPACK(0x808080); + break; + case WL_WALLELEC: + for(j=0; j<CELL; j++) + for(i=0; i<CELL; i++) + if(!(j%2) && !(i%2)) + fb[(ry+j)*w+(rx+i)] = PIXPACK(0xC0C0C0); + else + fb[(ry+j)*w+(rx+i)] = PIXPACK(0x808080); + break; } p++; } @@ -2820,7 +2899,7 @@ pixel *prerender_save(void *save, int size, int *width, int *height) j=d[p++]; if(j<PT_NUM && j>0) { - if(j==PT_STKM) //Stickman should be drawed another way + if(j==PT_STKM) { //Stickman drawing for(k=-2; k<=1; k++) |