From 0d336b111d9732dcd2f3f614f267f40a176e4320 Mon Sep 17 00:00:00 2001
From: simon <simon@cda61777-01e9-0310-a592-d414129be87e>
Date: Mon, 5 Sep 2005 17:21:05 +0000
Subject: [PATCH] Various patches from Ben H: a fix for an outdated comment, a
 couple of spurious ps_printf() arguments removed, and an error check in the
 `make install' target.

git-svn-id: svn://svn.tartarus.org/sgt/puzzles@6275 cda61777-01e9-0310-a592-d414129be87e
---
 Recipe |  3 ++-
 map.c  | 10 +++++++++-
 ps.c   |  2 +-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/Recipe b/Recipe
index e028c14..5907519 100644
--- a/Recipe
+++ b/Recipe
@@ -190,6 +190,7 @@ install:
 	         pattern rect solo mines samegame flip guess \
 		 pegs dominosa untangle blackbox slant lightup \
 		 map loopy inertia; do \
-		$(INSTALL_PROGRAM) -m 755 $$i $(DESTDIR)$(gamesdir)/$$i; \
+		$(INSTALL_PROGRAM) -m 755 $$i $(DESTDIR)$(gamesdir)/$$i \
+		|| exit 1; \
 	done
 !end
diff --git a/map.c b/map.c
index ef17efb..b06e664 100644
--- a/map.c
+++ b/map.c
@@ -2240,7 +2240,15 @@ static char *game_text_format(game_state *state)
 }
 
 struct game_ui {
-    int drag_colour;                   /* -1 means no drag active */
+    /*
+     * drag_colour:
+     * 
+     *  - -2 means no drag currently active.
+     *  - >=0 means we're dragging a solid colour.
+     * 	- -1 means we're dragging a blank space, and drag_pencil
+     * 	  might or might not add some pencil-mark stipples to that.
+     */
+    int drag_colour;
     int drag_pencil;
     int dragx, dragy;
     int show_numbers;
diff --git a/ps.c b/ps.c
index a2fd619..9dc03e8 100644
--- a/ps.c
+++ b/ps.c
@@ -112,7 +112,7 @@ static void ps_draw_text(void *handle, int x, int y, int fonttype,
     ps_setcolour(ps, colour);
     ps_printf(ps, "/%s findfont %d scalefont setfont\n",
 	      fonttype == FONT_FIXED ? "Courier" : "Helvetica",
-	      fontsize, x, y);
+	      fontsize);
     if (align & ALIGN_VCENTRE) {
 	ps_printf(ps, "newpath 0 0 moveto (X) true charpath flattenpath"
 		  " pathbbox\n"
-- 
2.11.0