From e84fc26fb83c33eba55357e78e52b2673a45b673 Mon Sep 17 00:00:00 2001
From: Franklin Wei <git@fwei.tk>
Date: Tue, 17 Apr 2018 18:46:05 -0400
Subject: [PATCH] puzzles: clean up for rockbox

Disabled vprintf() call in Filling, and reordered vertices in Unequal.

Change-Id: Ia3d8cd46ae3a7909b7dc2a8de762aa3173634d1e
---
 apps/plugins/puzzles/src/filling.c |  2 +-
 apps/plugins/puzzles/src/unequal.c | 24 ++++++++++++------------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/apps/plugins/puzzles/src/filling.c b/apps/plugins/puzzles/src/filling.c
index c331dac4a2..c278adacff 100644
--- a/apps/plugins/puzzles/src/filling.c
+++ b/apps/plugins/puzzles/src/filling.c
@@ -69,7 +69,7 @@
 static unsigned char verbose;
 
 static void printv(const char *fmt, ...) {
-#ifndef PALM
+#if !defined(PALM) && !defined(ROCKBOX)
     if (verbose) {
 	va_list va;
 	va_start(va, fmt);
diff --git a/apps/plugins/puzzles/src/unequal.c b/apps/plugins/puzzles/src/unequal.c
index d8204a4f33..5843ae2295 100644
--- a/apps/plugins/puzzles/src/unequal.c
+++ b/apps/plugins/puzzles/src/unequal.c
@@ -1683,18 +1683,18 @@ static void draw_gt(drawing *dr, int ox, int oy,
 {
     int coords[12];
     int xdx = (dx1+dx2 ? 0 : 1), xdy = (dx1+dx2 ? 1 : 0);
-    coords[0] = ox + xdx;
-    coords[1] = oy + xdy;
-    coords[2] = ox + xdx + dx1;
-    coords[3] = oy + xdy + dy1;
-    coords[4] = ox + xdx + dx1 + dx2;
-    coords[5] = oy + xdy + dy1 + dy2;
-    coords[6] = ox - xdx + dx1 + dx2;
-    coords[7] = oy - xdy + dy1 + dy2;
-    coords[8] = ox - xdx + dx1;
-    coords[9] = oy - xdy + dy1;
-    coords[10] = ox - xdx;
-    coords[11] = oy - xdy;
+    coords[0] = ox + xdx + dx1;
+    coords[1] = oy + xdy + dy1;
+    coords[2] = ox + xdx + dx1 + dx2;
+    coords[3] = oy + xdy + dy1 + dy2;
+    coords[4] = ox - xdx + dx1 + dx2;
+    coords[5] = oy - xdy + dy1 + dy2;
+    coords[6] = ox - xdx + dx1;
+    coords[7] = oy - xdy + dy1;
+    coords[8] = ox - xdx;
+    coords[9] = oy - xdy;
+    coords[10] = ox + xdx;
+    coords[11] = oy + xdy;
     draw_polygon(dr, coords, 6, col, col);
 }