washed-out yellow and green in Guess into their full-brightness pure
forms. This makes them hard to see against some backgrounds, so I'm
also surrounding all coloured pegs with black outlines. Looks a
little cartoony, but I think it's an overall improvement on the
previous look.
git-svn-id: svn://svn.tartarus.org/sgt/puzzles@6589
cda61777-01e9-0310-a592-
d414129be87e
ret[COL_1 * 3 + 1] = 0.0F;
ret[COL_1 * 3 + 2] = 0.0F;
ret[COL_1 * 3 + 1] = 0.0F;
ret[COL_1 * 3 + 2] = 0.0F;
- /* yellow (toned down a bit due to pale grey background) */
- ret[COL_2 * 3 + 0] = 0.7F;
- ret[COL_2 * 3 + 1] = 0.7F;
+ /* yellow */
+ ret[COL_2 * 3 + 0] = 1.0F;
+ ret[COL_2 * 3 + 1] = 1.0F;
ret[COL_2 * 3 + 2] = 0.0F;
ret[COL_2 * 3 + 2] = 0.0F;
- /* green (also toned down) */
ret[COL_3 * 3 + 0] = 0.0F;
ret[COL_3 * 3 + 0] = 0.0F;
- ret[COL_3 * 3 + 1] = 0.5F;
+ ret[COL_3 * 3 + 1] = 1.0F;
ret[COL_3 * 3 + 2] = 0.0F;
/* blue */
ret[COL_3 * 3 + 2] = 0.0F;
/* blue */
ret[COL_8 * 3 + 2] = 1.0F;
/* light green */
ret[COL_8 * 3 + 2] = 1.0F;
/* light green */
- ret[COL_9 * 3 + 0] = 0.5F;
- ret[COL_9 * 3 + 1] = 0.8F;
- ret[COL_9 * 3 + 2] = 0.5F;
+ ret[COL_9 * 3 + 0] = 0.7F;
+ ret[COL_9 * 3 + 1] = 1.0F;
+ ret[COL_9 * 3 + 2] = 0.7F;
/* pink */
ret[COL_10 * 3 + 0] = 1.0F;
/* pink */
ret[COL_10 * 3 + 0] = 1.0F;
COL_BACKGROUND);
if (PEGRAD > 0) {
draw_circle(dr, cx+PEGRAD, cy+PEGRAD, PEGRAD,
COL_BACKGROUND);
if (PEGRAD > 0) {
draw_circle(dr, cx+PEGRAD, cy+PEGRAD, PEGRAD,
- COL_EMPTY + col, COL_EMPTY + col);
+ COL_EMPTY + col, (col ? COL_FRAME : COL_EMPTY));
} else
draw_rect(dr, cx, cy, PEGSZ, PEGSZ, COL_EMPTY + col);
draw_update(dr, cx-CGAP, cy-CGAP, PEGSZ+CGAP*2, PEGSZ+CGAP*2);
} else
draw_rect(dr, cx, cy, PEGSZ, PEGSZ, COL_EMPTY + col);
draw_update(dr, cx-CGAP, cy-CGAP, PEGSZ+CGAP*2, PEGSZ+CGAP*2);
rowy += HINTOFF;
}
if (HINTRAD > 0) {
rowy += HINTOFF;
}
if (HINTRAD > 0) {
- draw_circle(dr, rowx+HINTRAD, rowy+HINTRAD, HINTRAD, col, col);
+ draw_circle(dr, rowx+HINTRAD, rowy+HINTRAD, HINTRAD, col,
+ (col == emptycol ? emptycol : COL_FRAME));
} else {
draw_rect(dr, rowx, rowy, HINTSZ, HINTSZ, col);
}
} else {
draw_rect(dr, rowx, rowy, HINTSZ, HINTSZ, col);
}