diff options
| author | Alex <zc00gii@gmail.com> | 2010-08-16 20:53:58 (GMT) |
|---|---|---|
| committer | Alex <zc00gii@gmail.com> | 2010-08-16 20:53:58 (GMT) |
| commit | b65fc882cae58bf7e9c88cfcdc5f19b4952c151a (patch) | |
| tree | 48ee63e1babca0dcb628575aecb236a82e4bf6e2 | |
| parent | a7acf80787cb29f932a2df4335ce6afdc02bfaf3 (diff) | |
| parent | 5826279c6d0bd1bf60ae106112fd00ab823adee2 (diff) | |
| download | powder-b65fc882cae58bf7e9c88cfcdc5f19b4952c151a.zip powder-b65fc882cae58bf7e9c88cfcdc5f19b4952c151a.tar.gz | |
MERGE\!
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | powder.c | 37 |
2 files changed, 37 insertions, 1 deletions
@@ -3,3 +3,4 @@ powder-64-sse3 powder.def powder-debug gmon.out +*.*.orig @@ -3231,7 +3231,42 @@ justdraw: blendpixel(vid, nx+1, ny+1, cr, cg, cb, 32); blendpixel(vid, nx-1, ny-1, cr, cg, cb, 32); } - + } else if(t==PT_PLUT) { + cr = 0x40; + cg = 0x70; + cb = 0x20; + blendpixel(vid, nx, ny, cr, cg, cb, 192); + blendpixel(vid, nx+1, ny, cr, cg, cb, 96); + blendpixel(vid, nx-1, ny, cr, cg, cb, 96); + blendpixel(vid, nx, ny+1, cr, cg, cb, 96); + blendpixel(vid, nx, ny-1, cr, cg, cb, 96); + for(int tempx = 2; tempx < 10; tempx++) { + for(int tempy = 2; tempy < 10; tempy++) { + blendpixel(vid, nx+tempx, ny-tempy, cr, cg, cb, 5); + blendpixel(vid, nx-tempx, ny+tempy, cr, cg, cb, 5); + blendpixel(vid, nx+tempx, ny+tempy, cr, cg, cb, 5); + blendpixel(vid, nx-tempx, ny-tempy, cr, cg, cb, 5); + } + } + } else if(t==PT_URAN) + { + cr = 0x70; + cg = 0x70; + cb = 0x20; + blendpixel(vid, nx, ny, cr, cg, cb, 192); + blendpixel(vid, nx+1, ny, cr, cg, cb, 96); + blendpixel(vid, nx-1, ny, cr, cg, cb, 96); + blendpixel(vid, nx, ny+1, cr, cg, cb, 96); + blendpixel(vid, nx, ny-1, cr, cg, cb, 96); + for(int tempx = 2; tempx < 10; tempx++) { + for(int tempy = 2; tempy < 10; tempy++) { + blendpixel(vid, nx+tempx, ny-tempy, cr, cg, cb, 5); + blendpixel(vid, nx-tempx, ny+tempy, cr, cg, cb, 5); + blendpixel(vid, nx+tempx, ny+tempy, cr, cg, cb, 5); + blendpixel(vid, nx-tempx, ny-tempy, cr, cg, cb, 5); + } + } +>>>>>>> simon/master } else if(t==PT_PLSM) { float ttemp = parts[i].life; |