X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/puzzles/blobdiff_plain/4a9957b631033dd550ade368dddad95fbc9d115d..HEAD:/misc.c

diff --git a/misc.c b/misc.c
index 81aa011..fe41332 100644
--- a/misc.c
+++ b/misc.c
@@ -187,8 +187,10 @@ void game_mkhighlight_specific(frontend *fe, float *ret,
     }
 
     for (i = 0; i < 3; i++) {
-        ret[highlight * 3 + i] = ret[background * 3 + i] * 1.2F;
-        ret[lowlight * 3 + i] = ret[background * 3 + i] * 0.8F;
+	if (highlight >= 0)
+	    ret[highlight * 3 + i] = ret[background * 3 + i] * 1.2F;
+	if (lowlight >= 0)
+	    ret[lowlight * 3 + i] = ret[background * 3 + i] * 0.8F;
     }
 }
 
@@ -244,6 +246,18 @@ void draw_rect_outline(drawing *dr, int x, int y, int w, int h, int colour)
     draw_polygon(dr, coords, 4, -1, colour);
 }
 
+void draw_rect_corners(drawing *dr, int cx, int cy, int r, int col)
+{
+    draw_line(dr, cx - r, cy - r, cx - r, cy - r/2, col);
+    draw_line(dr, cx - r, cy - r, cx - r/2, cy - r, col);
+    draw_line(dr, cx - r, cy + r, cx - r, cy + r/2, col);
+    draw_line(dr, cx - r, cy + r, cx - r/2, cy + r, col);
+    draw_line(dr, cx + r, cy - r, cx + r, cy - r/2, col);
+    draw_line(dr, cx + r, cy - r, cx + r/2, cy - r, col);
+    draw_line(dr, cx + r, cy + r, cx + r, cy + r/2, col);
+    draw_line(dr, cx + r, cy + r, cx + r/2, cy + r, col);
+}
+
 void move_cursor(int button, int *x, int *y, int maxw, int maxh, int wrap)
 {
     int dx = 0, dy = 0;
@@ -280,6 +294,35 @@ int c2pos(int w, int h, int cx, int cy)
     return -1; /* not reached */
 }
 
+int c2diff(int w, int h, int cx, int cy, int button)
+{
+    int diff = 0;
+
+    assert(IS_CURSOR_MOVE(button));
+
+    /* Obvious moves around edge. */
+    if (cy == -1)
+        diff = (button == CURSOR_RIGHT) ? +1 : (button == CURSOR_LEFT) ? -1 : diff;
+    if (cy == h)
+        diff = (button == CURSOR_RIGHT) ? -1 : (button == CURSOR_LEFT) ? +1 : diff;
+    if (cx == -1)
+        diff = (button == CURSOR_UP) ? +1 : (button == CURSOR_DOWN) ? -1 : diff;
+    if (cx == w)
+        diff = (button == CURSOR_UP) ? -1 : (button == CURSOR_DOWN) ? +1 : diff;
+
+    if (button == CURSOR_LEFT && cx == w && (cy == 0 || cy == h-1))
+        diff = (cy == 0) ? -1 : +1;
+    if (button == CURSOR_RIGHT && cx == -1 && (cy == 0 || cy == h-1))
+        diff = (cy == 0) ? +1 : -1;
+    if (button == CURSOR_DOWN && cy == -1 && (cx == 0 || cx == w-1))
+        diff = (cx == 0) ? -1 : +1;
+    if (button == CURSOR_UP && cy == h && (cx == 0 || cx == w-1))
+        diff = (cx == 0) ? +1 : -1;
+
+    debug(("cx,cy = %d,%d; w%d h%d, diff = %d", cx, cy, w, h, diff));
+    return diff;
+}
+
 void pos2c(int w, int h, int pos, int *cx, int *cy)
 {
     int max = w+h+w+h;