shithub: puzzles

Info  •  Files  •  Log  •  Branches

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.

[originally from svn r6275]

--- a/Recipe

+++ b/Recipe

@@ -190,6 +190,7 @@

 	         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

--- a/map.c

+++ b/map.c

@@ -2240,7 +2240,15 @@

 }

 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;

--- a/ps.c

+++ b/ps.c

@@ -112,7 +112,7 @@

     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"