Fix problems with arrow UI with non-square grid.

[sgt/puzzles] / misc.c

diff --git a/misc.c b/misc.c
index 17ec48c..8f5314c 100644 (file)
--- a/misc.c
+++ b/misc.c
@@ -147,8 +147,6 @@ unsigned char *hex2bin(const char *in, int outlen)
     unsigned char *ret = snewn(outlen, unsigned char);
     int i;
 
-    debug(("hex2bin: in '%s'", in));
-
     memset(ret, 0, outlen*sizeof(unsigned char));
     for (i = 0; i < outlen*2; i++) {
         int c = in[i];
@@ -196,20 +194,49 @@ void game_mkhighlight(frontend *fe, float *ret,
     }
 }
 
+static void memswap(void *av, void *bv, int size)
+{
+    char tmpbuf[512];
+    char *a = av, *b = bv;
+
+    while (size > 0) {
+       int thislen = min(size, sizeof(tmpbuf));
+       memcpy(tmpbuf, a, thislen);
+       memcpy(a, b, thislen);
+       memcpy(b, tmpbuf, thislen);
+       a += thislen;
+       b += thislen;
+       size -= thislen;
+    }
+}
+
 void shuffle(void *array, int nelts, int eltsize, random_state *rs)
 {
-    char *tmp = smalloc(eltsize);
     char *carray = (char *)array;
     int i;
 
     for (i = nelts; i-- > 1 ;) {
         int j = random_upto(rs, i+1);
-        if (j != i) {
-            memcpy(tmp, carray + eltsize * i, eltsize);
-            memcpy(carray + eltsize * i, carray + eltsize * j, eltsize);
-            memcpy(carray + eltsize * j, tmp, eltsize);
-        }
+        if (j != i)
+            memswap(carray + eltsize * i, carray + eltsize * j, eltsize);
     }
 }
 
+void draw_rect_outline(drawing *dr, int x, int y, int w, int h, int colour)
+{
+    int x0 = x, x1 = x+w-1, y0 = y, y1 = y+h-1;
+    int coords[8];
+
+    coords[0] = x0;
+    coords[1] = y0;
+    coords[2] = x0;
+    coords[3] = y1;
+    coords[4] = x1;
+    coords[5] = y1;
+    coords[6] = x1;
+    coords[7] = y0;
+
+    draw_polygon(dr, coords, 4, -1, colour);
+}
+
 /* vim: set shiftwidth=4 tabstop=8: */