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

[originally from svn r7552]

diff --git a/misc.c b/misc.c
index 8f5314ce79bc266602da57aab2b73e7daf01112e..d3ab815a6416b7c7d5e5ffdaa983bcad53953884 100644 (file)
--- 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 37857725f6ad62b9cf2c657f2a690121097b9d5e..9b69d1b005b35e1644f4dabec50b41935f017de4 100644 (file)
--- 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);