Add a new misc.c function needed by Slide's colour setup.

[originally from svn r7552]
This commit is contained in:
Simon Tatham
2007-05-07 17:50:14 +00:00
parent 7fce4f57c2
commit ab80d0b7fd
2 changed files with 13 additions and 4 deletions

11
misc.c
View File

@ -167,14 +167,12 @@ unsigned char *hex2bin(const char *in, int outlen)
return ret; return ret;
} }
void game_mkhighlight(frontend *fe, float *ret, void game_mkhighlight_specific(frontend *fe, float *ret,
int background, int highlight, int lowlight) int background, int highlight, int lowlight)
{ {
float max; float max;
int i; int i;
frontend_default_colour(fe, &ret[background * 3]);
/* /*
* Drop the background colour so that the highlight is * Drop the background colour so that the highlight is
* noticeably brighter than it while still being under 1. * 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) static void memswap(void *av, void *bv, int size)
{ {
char tmpbuf[512]; char tmpbuf[512];

View File

@ -280,6 +280,10 @@ unsigned char *hex2bin(const char *in, int outlen);
* and auto-generates highlight and lowlight colours too. */ * and auto-generates highlight and lowlight colours too. */
void game_mkhighlight(frontend *fe, float *ret, void game_mkhighlight(frontend *fe, float *ret,
int background, int highlight, int lowlight); 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. */ /* Randomly shuffles an array of items. */
void shuffle(void *array, int nelts, int eltsize, random_state *rs); void shuffle(void *array, int nelts, int eltsize, random_state *rs);