X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=hacks%2Ftriangle.c;h=48a8b20d67c86090fe53a07d2e1509a78a7d4c9b;hp=3f413432564b15c8f46f4f75db4043d443e9ca2c;hb=f8cf5ac7b2f53510f80a0eaf286a25298be17bfe;hpb=ec8d2b32b63649e6d32bdfb306eda062769af823 diff --git a/hacks/triangle.c b/hacks/triangle.c index 3f413432..48a8b20d 100644 --- a/hacks/triangle.c +++ b/hacks/triangle.c @@ -107,7 +107,7 @@ draw_atriangle(ModeInfo * mi, XPoint * p, int y_0, int y_1, int y_2, double dinv Window window = MI_WINDOW(mi); GC gc = MI_GC(mi); - if (MI_NPIXELS(mi) > 2) { /* color */ + if (MI_NCOLORS(mi) > 2) { /* color */ int dmax, dmin; long color; @@ -119,11 +119,11 @@ draw_atriangle(ModeInfo * mi, XPoint * p, int y_0, int y_1, int y_2, double dinv if (dmax == 0) { color = BLUE; } else { - color = MI_NPIXELS(mi) - - (int) ((double) MI_NPIXELS(mi) / M_PI_2 * atan(dinv * (dmax - dmin))); + color = MI_NCOLORS(mi) - + (int) ((double) MI_NCOLORS(mi) / M_PI_2 * atan(dinv * (dmax - dmin))); } - XSetForeground(display, gc, MI_PIXEL(mi, color % MI_NPIXELS(mi))); + XSetForeground(display, gc, mi->colors[color % MI_NCOLORS(mi)].pixel); XFillPolygon(display, window, gc, p, 3, Convex, CoordModeOrigin); } else { /* mono */