zakarya/puzzles
1
0
Fork 0
mirror of git://git.tartarus.org/simon/puzzles.git synced 2025-04-21 08:01:30 -07:00
Code Issues Packages Projects Releases Wiki Activity

Various patches from Ben H: a fix for an outdated comment, a couple

Browse Source 
of spurious ps_printf() arguments removed, and an error check in the
`make install' target.

[originally from svn r6275]
This commit is contained in:
Simon Tatham
2005-09-05 17:21:05 +00:00
parent 56ff3647e2
commit 7096df54de
3 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Recipe
View File

@ -190,6 +190,7 @@ install:
pattern rect solo mines samegame flip guess \ pattern rect solo mines samegame flip guess \
pegs dominosa untangle blackbox slant lightup \ pegs dominosa untangle blackbox slant lightup \
map loopy inertia; do \ map loopy inertia; do \
$(INSTALL_PROGRAM) -m 755 $$i $(DESTDIR)$(gamesdir)/$$i; \ $(INSTALL_PROGRAM) -m 755 $$i $(DESTDIR)$(gamesdir)/$$i \
|| exit 1; \
done done
!end !end

10
map.c
View File

@ -2240,7 +2240,15 @@ static char *game_text_format(game_state *state)
} }
struct game_ui { 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 drag_pencil;
int dragx, dragy; int dragx, dragy;
int show_numbers; int show_numbers;

2
ps.c
View File

@ -112,7 +112,7 @@ static void ps_draw_text(void *handle, int x, int y, int fonttype,
ps_setcolour(ps, colour); ps_setcolour(ps, colour);
ps_printf(ps, "/%s findfont %d scalefont setfont\n", ps_printf(ps, "/%s findfont %d scalefont setfont\n",
fonttype == FONT_FIXED ? "Courier" : "Helvetica", fonttype == FONT_FIXED ? "Courier" : "Helvetica",
fontsize, x, y); fontsize);
if (align & ALIGN_VCENTRE) { if (align & ALIGN_VCENTRE) {
ps_printf(ps, "newpath 0 0 moveto (X) true charpath flattenpath" ps_printf(ps, "newpath 0 0 moveto (X) true charpath flattenpath"
" pathbbox\n" " pathbbox\n"