aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Tatham <anakin@pobox.com>2007-05-07 17:50:14 +0000
committerSimon Tatham <anakin@pobox.com>2007-05-07 17:50:14 +0000
commitab80d0b7fdd07bfc9037a44df97d862ce5e986ea (patch)
treeb7d9b1a23239ed73ce9f82d26de83d991361d302
parent7fce4f57c201fe6a60ab25ccb62f089c711e97cc (diff)
downloadpuzzles-ab80d0b7fdd07bfc9037a44df97d862ce5e986ea.zip
puzzles-ab80d0b7fdd07bfc9037a44df97d862ce5e986ea.tar.gz
puzzles-ab80d0b7fdd07bfc9037a44df97d862ce5e986ea.tar.bz2
puzzles-ab80d0b7fdd07bfc9037a44df97d862ce5e986ea.tar.xz
Add a new misc.c function needed by Slide's colour setup.
[originally from svn r7552]
-rw-r--r--misc.c13
-rw-r--r--puzzles.h4
2 files changed, 13 insertions, 4 deletions
diff --git a/misc.c b/misc.c
index 8f5314c..d3ab815 100644
--- a/misc.c
+++ b/misc.c
@@ -167,14 +167,12 @@ unsigned char *hex2bin(const char *in, int outlen)
return ret;
}
-void game_mkhighlight(frontend *fe, float *ret,
- int background, int highlight, int lowlight)
+void game_mkhighlight_specific(frontend *fe, float *ret,
+ int background, int highlight, int lowlight)
{
float max;
int i;
- frontend_default_colour(fe, &ret[background * 3]);
-
/*
* Drop the background colour so that the highlight is
* noticeably brighter than it while still being under 1.
@@ -194,6 +192,13 @@ void game_mkhighlight(frontend *fe, float *ret,
}
}
+void game_mkhighlight(frontend *fe, float *ret,
+ int background, int highlight, int lowlight)
+{
+ frontend_default_colour(fe, &ret[background * 3]);
+ game_mkhighlight_specific(fe, ret, background, highlight, lowlight);
+}
+
static void memswap(void *av, void *bv, int size)
{
char tmpbuf[512];
diff --git a/puzzles.h b/puzzles.h
index 3785772..9b69d1b 100644
--- a/puzzles.h
+++ b/puzzles.h
@@ -280,6 +280,10 @@ unsigned char *hex2bin(const char *in, int outlen);
* and auto-generates highlight and lowlight colours too. */
void game_mkhighlight(frontend *fe, float *ret,
int background, int highlight, int lowlight);
+/* As above, but starts from a provided background colour rather
+ * than the frontend default. */
+void game_mkhighlight_specific(frontend *fe, float *ret,
+ int background, int highlight, int lowlight);
/* Randomly shuffles an array of items. */
void shuffle(void *array, int nelts, int eltsize, random_state *rs);