diff options
| author | Simon Tatham <anakin@pobox.com> | 2005-09-05 17:21:05 +0000 |
|---|---|---|
| committer | Simon Tatham <anakin@pobox.com> | 2005-09-05 17:21:05 +0000 |
| commit | 7096df54deb2b8d3ef230dad4b4e905574236eda (patch) | |
| tree | dbe144254727fca44de98df6d956139a98b70774 | |
| parent | 56ff3647e272b672f8dca8b947bb571ba30d4742 (diff) | |
| download | puzzles-7096df54deb2b8d3ef230dad4b4e905574236eda.zip puzzles-7096df54deb2b8d3ef230dad4b4e905574236eda.tar.gz puzzles-7096df54deb2b8d3ef230dad4b4e905574236eda.tar.bz2 puzzles-7096df54deb2b8d3ef230dad4b4e905574236eda.tar.xz | |
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]
| -rw-r--r-- | Recipe | 3 | ||||
| -rw-r--r-- | map.c | 10 | ||||
| -rw-r--r-- | ps.c | 2 |
3 files changed, 12 insertions, 3 deletions
@@ -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 @@ -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; @@ -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" |