summaryrefslogtreecommitdiff
path: root/src/graphics.c
diff options
context:
space:
mode:
authorjacksonmj <jacksonmj@jacksonmj.none>2011-01-29 10:45:27 (GMT)
committer jacksonmj <jacksonmj@jacksonmj.none>2011-01-29 10:50:43 (GMT)
commit9938378c0d7eed11dc3cf2db67dfd32d0c31dfd7 (patch)
treed75a70b7ea481142563ac6d4d9799aee65c2e1e8 /src/graphics.c
parentfe033ce859b1d5db91fa840e0353403ab19b0d3a (diff)
parent4b5337c03a0a64a12e1d66829c14af73f1ff0398 (diff)
downloadpowder-9938378c0d7eed11dc3cf2db67dfd32d0c31dfd7.zip
powder-9938378c0d7eed11dc3cf2db67dfd32d0c31dfd7.tar.gz
Merge remote branch 'cracker64' into dev
Conflicts: includes/element.h includes/powder.h src/elements/firw.c src/elements/legacy.c src/elements/phot.c src/elements/sprk.c src/graphics.c src/main.c src/powder.c
Diffstat (limited to 'src/graphics.c')
-rw-r--r--src/graphics.c43
1 files changed, 43 insertions, 0 deletions
diff --git a/src/graphics.c b/src/graphics.c
index 06cd6fb..b18a659 100644
--- a/src/graphics.c
+++ b/src/graphics.c
@@ -1714,6 +1714,49 @@ void draw_parts(pixel *vid)
blendpixel(vid, nx, ny, cr, cg, cb, 255);
}
+ else if(t==PT_LOTE)
+ {
+ if(parts[i].tmp==2)
+ blendpixel(vid, nx, ny, 255, 128, 0, 255);
+ else if(parts[i].tmp==1)
+ blendpixel(vid, nx, ny, 255, 255, 0, 255);
+ else
+ blendpixel(vid, nx, ny, 255, 0, 0, 255);
+ }
+ else if(t==PT_FRG2)
+ {
+ if(parts[i].tmp==2)
+ blendpixel(vid, nx, ny, 0, 100, 50, 255);
+ else
+ blendpixel(vid, nx, ny, 0, 255, 90, 255);
+ }
+ else if(t==PT_STAR)
+ {
+ if(parts[i].tmp==4)
+ blendpixel(vid, nx, ny, 0, 0, 128, 255);
+ else if(parts[i].tmp==3)
+ blendpixel(vid, nx, ny, 0, 0, 150, 255);
+ else if(parts[i].tmp==2)
+ blendpixel(vid, nx, ny, 0, 0, 190, 255);
+ else if(parts[i].tmp==1)
+ blendpixel(vid, nx, ny, 0, 0, 230, 255);
+ else
+ blendpixel(vid, nx, ny, 0, 0, 70, 255);
+ }
+ else if(t==PT_FROG)
+ {
+ if(parts[i].tmp==2)
+ blendpixel(vid, nx, ny, 0, 100, 0, 255);
+ else
+ blendpixel(vid, nx, ny, 0, 255, 0, 255);
+ }
+ else if(t==PT_BRAN)
+ {
+ if(parts[i].tmp==1)
+ blendpixel(vid, nx, ny, 150, 150, 0, 255);
+ else
+ blendpixel(vid, nx, ny, 255, 255, 0, 255);
+ }
else if (t==PT_DEUT)
{