chiark / gitweb /
sgt-puzzles.git
15 years agoOops, left this out of r8178: having defined COMBINED everywhere in
Simon Tatham [Sat, 13 Sep 2008 19:18:42 +0000 (19:18 +0000)]
Oops, left this out of r8178: having defined COMBINED everywhere in
the puzzles, we can now remove it from the OS X makefile section.

[originally from svn r8179]
[r8178 == 43eafe1fdf356c0c1c88936ffa79c83291973b5d]

15 years agoChange to the handling of -DCOMBINED in the makefiles. Instead of
Simon Tatham [Sat, 13 Sep 2008 19:17:26 +0000 (19:17 +0000)]
Change to the handling of -DCOMBINED in the makefiles. Instead of
defining it centrally per port, I think it's neater to define it for
each puzzle when adding that puzzle to the ALL list - because those
front ends which take -DCOMBINED are precisely those which use ALL.
In particular, this change opens up the possibility of compiling
both individual puzzles _and_ a combined monolith within the same
makefile.

[originally from svn r8178]

15 years agoPatch from James H providing lots more paranoid casting. Also one
Simon Tatham [Sat, 13 Sep 2008 18:29:20 +0000 (18:29 +0000)]
Patch from James H providing lots more paranoid casting. Also one
actual behaviour change: Untangle now permits dragging with the
right mouse button, which has exactly the same effect as it does
with the left. (Harmless on desktop platforms, but helpful when
"right-click" is achieved by press-and-hold; now the drag takes
place even if you hesitate first.)

[originally from svn r8177]

15 years agoPatch from James H to centralise some generally useful cursor-
Simon Tatham [Sat, 13 Sep 2008 18:26:53 +0000 (18:26 +0000)]
Patch from James H to centralise some generally useful cursor-
handling functionality into misc.c.

[originally from svn r8176]

15 years agoSince the lack of this has caused portability issues in the past:
Simon Tatham [Sat, 13 Sep 2008 18:25:19 +0000 (18:25 +0000)]
Since the lack of this has caused portability issues in the past:
add "-ansi -pedantic" to the main Unix makefile, and clean up a few
minor problems pointed out thereby.

[originally from svn r8175]

15 years agoPatch from James H to make new-Loopy port more easily.
Simon Tatham [Wed, 10 Sep 2008 21:44:23 +0000 (21:44 +0000)]
Patch from James H to make new-Loopy port more easily.

[originally from svn r8174]

15 years agoHaving played new-Loopy a bit recently, I've had occasion to think a
Simon Tatham [Sun, 7 Sep 2008 10:02:40 +0000 (10:02 +0000)]
Having played new-Loopy a bit recently, I've had occasion to think a
bit harder about advanced solver techniques. Expand the comment at
the top of the file.

[originally from svn r8167]

15 years agoHow did I manage to check this in without actually trying to build
Simon Tatham [Sun, 7 Sep 2008 08:35:52 +0000 (08:35 +0000)]
How did I manage to check this in without actually trying to build
on Windows at all?! Fix some departures from the C standard, mostly
declaring variables after a statement has already been issued in the
same block. MSVC is picky about this where gcc is forgiving, and TBH
I'd change the latter given the choice.

[originally from svn r8166]

15 years agoNew Loopy save file, compatible with the new Loopy.
Simon Tatham [Sat, 6 Sep 2008 21:24:21 +0000 (21:24 +0000)]
New Loopy save file, compatible with the new Loopy.

[originally from svn r8165]

15 years agoNearly forgot: Lambros definitely deserves a place in the copyright
Simon Tatham [Sat, 6 Sep 2008 17:38:43 +0000 (17:38 +0000)]
Nearly forgot: Lambros definitely deserves a place in the copyright
statement!

[originally from svn r8164]

15 years agoDon't call changed_preset() until after we've initialised
Simon Tatham [Sat, 6 Sep 2008 17:33:04 +0000 (17:33 +0000)]
Don't call changed_preset() until after we've initialised
fe->copy_menu_item.

[originally from svn r8163]

15 years agoCompletely re-engineered version of Loopy, courtesy of Lambros
Simon Tatham [Sat, 6 Sep 2008 15:19:47 +0000 (15:19 +0000)]
Completely re-engineered version of Loopy, courtesy of Lambros
Lambrou. Now capable of handling triangular and hexagonal grids as
well as square ones, and then a number of semiregular plane tilings
and duals of semiregular ones. In fact, most of the solver code
supports an _arbitrary_ planar graph (well, provided both the graph
and its dual have no self-edges), so it could easily be extended
further with only a little more effort.

[originally from svn r8162]

15 years agoNew infrastructure feature. Games are now permitted to be
Simon Tatham [Sat, 6 Sep 2008 09:27:56 +0000 (09:27 +0000)]
New infrastructure feature. Games are now permitted to be
_conditionally_ able to format the current puzzle as text to be sent
to the clipboard. For instance, if a game were to support playing on
a square grid and on other kinds of grid such as hexagonal, then it
might reasonably feel that only the former could be sensibly
rendered in ASCII art; so it can now arrange for the "Copy" menu
item to be greyed out depending on the game_params.

To do this I've introduced a new backend function
(can_format_as_text_now()), and renamed the existing static backend
field "can_format_as_text" to "can_format_as_text_ever". The latter
will cause compile errors for anyone maintaining a third-party front
end; if any such person is reading this, I apologise to them for the
inconvenience, but I did do it deliberately so that they'd know to
update their front end.

As yet, no checked-in game actually uses this feature; all current
games can still either copy always or copy never.

[originally from svn r8161]

15 years agoCorrection from James H: sqrt(0) shouldn't occur any more than
Simon Tatham [Sat, 5 Jul 2008 22:07:35 +0000 (22:07 +0000)]
Correction from James H: sqrt(0) shouldn't occur any more than
sqrt(1) should.

[originally from svn r8108]

15 years agoMore operations and bug fixes from James H.
Simon Tatham [Sat, 5 Jul 2008 15:40:43 +0000 (15:40 +0000)]
More operations and bug fixes from James H.

[originally from svn r8107]

15 years agoRemove rogue diagnostic.
Simon Tatham [Sat, 5 Jul 2008 13:32:28 +0000 (13:32 +0000)]
Remove rogue diagnostic.

[originally from svn r8106]

15 years agoAdd a build version designation to the NestedVM build, after Jacob
Simon Tatham [Sat, 5 Jul 2008 13:31:59 +0000 (13:31 +0000)]
Add a build version designation to the NestedVM build, after Jacob
pointed out that Help > About in the Java applets on my website
currently reports "Unidentified build".

[originally from svn r8105]

15 years agoBuild the Java versions of the puzzles automatically as part of the
Simon Tatham [Fri, 27 Jun 2008 17:28:32 +0000 (17:28 +0000)]
Build the Java versions of the puzzles automatically as part of the
build process. Also update the new-puzzle checklist to make sure I
set up and test the Java applet for any new game I add.

[originally from svn r8096]

15 years agoHandle a <param name="game_id"> by passing it in to the C side as
Simon Tatham [Thu, 26 Jun 2008 19:09:07 +0000 (19:09 +0000)]
Handle a <param name="game_id"> by passing it in to the C side as
argv[1], which in turn feeds it into the midend as a game ID. This
can of course take any of the forms supported by the native C
puzzles: a pure game parameter string, a params:description specific
game ID, or a params#seed random game ID.

[originally from svn r8095]

15 years agoThe Java console keeps showing up error reports due to being asked
Simon Tatham [Thu, 26 Jun 2008 19:07:44 +0000 (19:07 +0000)]
The Java console keeps showing up error reports due to being asked
to resize the puzzle to zero size. Ignore all such requests, in the
assumption that a more sensible resize will be along soon enough
(which does seem to happen, though I haven't debugged the NestedVM
front end hard enough to figure out why the bogus resizes happen in
the first place).

[originally from svn r8094]

15 years agoJames H has helpfully provided yet more silly operators for the -A
Simon Tatham [Tue, 24 Jun 2008 20:58:35 +0000 (20:58 +0000)]
James H has helpfully provided yet more silly operators for the -A
mode. I think some user-defined ruleset configuration options are
now required...

[originally from svn r8092]

15 years agoAn option to enable a debugging mode for the BFS.
Simon Tatham [Mon, 23 Jun 2008 17:34:56 +0000 (17:34 +0000)]
An option to enable a debugging mode for the BFS.

[originally from svn r8091]

15 years agoMichael Schierl's patch to compile the puzzles as Java applets using
Simon Tatham [Tue, 10 Jun 2008 20:35:17 +0000 (20:35 +0000)]
Michael Schierl's patch to compile the puzzles as Java applets using
NestedVM. Wow!

[originally from svn r8064]

15 years agoJust noticed that the return value of midend_process_key() wasn't
Simon Tatham [Tue, 10 Jun 2008 17:24:09 +0000 (17:24 +0000)]
Just noticed that the return value of midend_process_key() wasn't
documented.

[originally from svn r8062]

15 years agoNew -A mode permitting even madder operators, and also -m to try to
Simon Tatham [Mon, 9 Jun 2008 18:28:03 +0000 (18:28 +0000)]
New -A mode permitting even madder operators, and also -m to try to
print all possible paths to a value. The latter has a lot of
de-duplication left to be done, due to multiple evaluation orders.

[originally from svn r8061]

16 years agoShamelessly pander to compilers whose data flow warning systems
Simon Tatham [Mon, 14 Apr 2008 11:32:06 +0000 (11:32 +0000)]
Shamelessly pander to compilers whose data flow warning systems
insist that a variable should be initialised in all branches of an
if, instead of just all the non-assertion-failing ones.

[originally from svn r7989]

16 years agoNow that we're highlighting the currently selected preset in the
Simon Tatham [Thu, 10 Apr 2008 11:11:33 +0000 (11:11 +0000)]
Now that we're highlighting the currently selected preset in the
Type menu, it looks faintly silly that Fifteen doesn't have any
presets other than Custom: you open a Fifteen window in its default
state, and the Type menu appears to be telling you it has a custom
size! Fixed by adding a preset for the default parameters.

I'd quite like to fix this properly by revamping the presets
mechanism in a way that _enforces_ that there must always be a
preset which matches the default parameters, but that's more fiddly
than it sounds. For the moment, this change fixes the only
externally visible infelicity in the current game set.

[originally from svn r7983]

16 years agoImplement tick marks in the Type menu on Windows. Now all my front
Simon Tatham [Wed, 9 Apr 2008 14:57:20 +0000 (14:57 +0000)]
Implement tick marks in the Type menu on Windows. Now all my front
ends have got them.

[originally from svn r7982]

16 years agoImplement tick marks in the Type menu on OS X.
Simon Tatham [Wed, 9 Apr 2008 14:36:08 +0000 (14:36 +0000)]
Implement tick marks in the Type menu on OS X.

[originally from svn r7981]

16 years agoNew feature in midend.c which allows us to ask for the number of the
Simon Tatham [Tue, 8 Apr 2008 16:25:39 +0000 (16:25 +0000)]
New feature in midend.c which allows us to ask for the number of the
currently selected preset, if any. I've used this in the GTK front
end to have the Type menu mark the currently selected menu item.
(After considerable beating of GTK with sticks, I might add. Grr.)
Currently the same UI feature is not yet supported on Windows or
MacOS, but I hope to do those too at some point if it's feasible.

[originally from svn r7980]

16 years agoHaving got Jigsaw mode generation working at reasonable speed, we
Simon Tatham [Tue, 8 Apr 2008 10:30:18 +0000 (10:30 +0000)]
Having got Jigsaw mode generation working at reasonable speed, we
can now productise it.

[originally from svn r7979]

16 years agoImprovements to filled-grid generation. Introduced a cunning idea
Simon Tatham [Tue, 8 Apr 2008 09:36:33 +0000 (09:36 +0000)]
Improvements to filled-grid generation. Introduced a cunning idea
suggested by IWJ last night: grid generation can immediately choose
an entire grid row randomly, since all that's doing is nailing down
the names of the numbers, and that gets the whole thing started more
efficiently. But the main difference is that now grid generation is
given only area^2 steps to come up with a filled grid, and then cut
off unceremoniously, causing grid generation to fail and be retried
from scratch. This seems to prevent hangups on jigsaw layouts that
admit few useful solutions, by changing layout constantly. 9j
puzzles now generate at a sensible rate, and as an added bonus so do
5x5 normal puzzles, which they never used to.

[originally from svn r7978]

16 years agoAhem. Apparently forgot to compile-test after that one last tiny
Simon Tatham [Mon, 7 Apr 2008 17:16:08 +0000 (17:16 +0000)]
Ahem. Apparently forgot to compile-test after that one last tiny
change.

[originally from svn r7977]

16 years agoRevise the printing colour framework so that we can explicitly
Simon Tatham [Mon, 7 Apr 2008 17:13:29 +0000 (17:13 +0000)]
Revise the printing colour framework so that we can explicitly
request either of hatching or halftoning, and also choose which to
supply as a fallback when printing in colour.

[originally from svn r7976]

16 years agoPedantic tweaks to allow successful compilation on Windows. (gcc
Simon Tatham [Mon, 7 Apr 2008 17:12:21 +0000 (17:12 +0000)]
Pedantic tweaks to allow successful compilation on Windows. (gcc
failed to point out a declaration after a statement, and gcc's
linker was clever enough to optimise the call to divvy_rectangle()
out of solosolver so that I didn't have to include divvy.c in that.)

[originally from svn r7975]

16 years agoSubstantial reworking of Solo so that it implements both Sudoku-X
Simon Tatham [Mon, 7 Apr 2008 15:56:42 +0000 (15:56 +0000)]
Substantial reworking of Solo so that it implements both Sudoku-X
(require both main diagonals to have one of every digit in addition
to all the usual constraints) and Jigsaw Sudoku (replace the array
of rectangular sub-blocks with the sub-blocks being random
polyominoes). To implement the latter, I've moved my `divvy.c'
library routine out of the `unfinished' subdirectory.

Jigsaw mode is currently an undocumented feature: you enable it by
setting the rows parameter to 1 (and the columns parameter to your
desired grid size, which unlike normal Sudoku can be anything you
like including a prime number). The reason it's undocumented is
because generation times are not yet reliably short: sometimes
generating a jigsaw-type puzzle can hang for hours and still get
nowhere. (The algorithm should terminate in principle, but not in
any time you're prepared to wait.) I _think_ I know how to solve
this, but have yet to try it. Until then, jigsaw mode will remain a
hidden feature.

Printing of X-type puzzles is also substandard at present, because
the current print-colour API replaces the desired light shading of
the X-cells with heavy diagonal hatching. I plan to adjust the API
imminently to address this.

[originally from svn r7974]

16 years agoHmm. Telling xvfb to default to a TrueColor visual did help, in that
Simon Tatham [Thu, 20 Mar 2008 09:18:26 +0000 (09:18 +0000)]
Hmm. Telling xvfb to default to a TrueColor visual did help, in that
it got rid of the bogus backgrounds on all the text; but on the
other hand it mysteriously caused all the images to become black and
white! Serves me right for testing with Bridges which was B&W to
start with. Instead, we'll just tell xvfb to use a 24-bit display
and let it sort out the visuals for itself; that seems to work better.

[originally from svn r7932]

16 years agoI _think_, after some fairly random experimentation, that this ought
Simon Tatham [Thu, 20 Mar 2008 00:19:27 +0000 (00:19 +0000)]
I _think_, after some fairly random experimentation, that this ought
to fix the weird blacked-out text in the xvfb-built screenshots.

[originally from svn r7931]

16 years agoUpdate the OS X Puzzles makefile so that it builds on Leopard and
Simon Tatham [Tue, 11 Mar 2008 17:59:38 +0000 (17:59 +0000)]
Update the OS X Puzzles makefile so that it builds on Leopard and
generates PPC/Intel dual-architecture binaries.

This turns out not to be too painful: you compile and link your
programs using `gcc -arch ppc' or `gcc -arch i386', then you use a
command of the form `lipo -create ppc-binary i386-binary -output
binary' to construct a universal binary. It works equally well on
command-line standalone executable files and the executables within
application directories. Also added the -mmacosx-version-min option,
since otherwise the OS X build tools appear to default to building
binaries which will crash (without anything resembling a
comprehensible error message) on any earlier release.

The handling of version.o in this checkin is somewhat grotty. I'd
prefer a method more cleverly intertwingled with mkfiles.pl so I
didn't have to maintain the OS X architecture list in both
mkfiles.pl and Recipe. (Not that I anticipate Apple switching
architectures again in the immediate future, but it's the principle
of the thing.)

[originally from svn r7916]

16 years agoUI change to Filling: allow multiple squares to be set at once.
Jacob Nevins [Sun, 10 Feb 2008 18:43:29 +0000 (18:43 +0000)]
UI change to Filling: allow multiple squares to be set at once.

(This change adds a new possibility to the save format, such that new save
files won't necessarily be loadable by old binaries. I think that's acceptable
-- it's certainly happened before -- but I couldn't find anything in the
developer docs explicitly blessing it.)

[originally from svn r7849]

16 years agoIt's another new year.
Jacob Nevins [Sun, 10 Feb 2008 17:12:49 +0000 (17:12 +0000)]
It's another new year.

[originally from svn r7848]

16 years agoSyntactic fixes by Zach Wily to make the OS X build work under 10.5.
Simon Tatham [Tue, 15 Jan 2008 18:04:13 +0000 (18:04 +0000)]
Syntactic fixes by Zach Wily to make the OS X build work under 10.5.

[originally from svn r7836]

16 years ago64-bit cleanliness: we were already carefully using a uint32 type in
Simon Tatham [Sat, 15 Dec 2007 21:09:45 +0000 (21:09 +0000)]
64-bit cleanliness: we were already carefully using a uint32 type in
the SHA code, but it wasn't correctly defined!

[originally from svn r7817]

16 years agoA rigorous proof. Totally unimportant to the code, but I didn't want
Simon Tatham [Sat, 25 Aug 2007 17:46:13 +0000 (17:46 +0000)]
A rigorous proof. Totally unimportant to the code, but I didn't want
to lose it :-)

[originally from svn r7703]

16 years agoFix an inaccurate comment.
Simon Tatham [Sat, 25 Aug 2007 15:50:33 +0000 (15:50 +0000)]
Fix an inaccurate comment.

[originally from svn r7702]

16 years agoI've just realised that my deliberate avoidance of non-simply
Simon Tatham [Sat, 25 Aug 2007 15:32:41 +0000 (15:32 +0000)]
I've just realised that my deliberate avoidance of non-simply
connected polyominoes actually causes a loss of generality for
sufficiently large k. I hadn't previously noticed, because you need
k to be (I think) at least 23 and none of my potential applications
require anything nearly that large. Add some discussion of this.

[originally from svn r7701]

16 years agoCommit my work so far on a generator for Nikoli's `Block Puzzle'. It
Simon Tatham [Sat, 25 Aug 2007 14:10:49 +0000 (14:10 +0000)]
Commit my work so far on a generator for Nikoli's `Block Puzzle'. It
works, but it's slow, and the puzzles are currently at a relatively
low level of difficulty. Also this is a generator only: no UI yet
(because I'm waiting to see if I can make the generator practical
before bothering to write the rest).

[originally from svn r7700]

16 years agoAhem. Finishing writing the comment _before_ checkin is generally sensible.
Simon Tatham [Sat, 18 Aug 2007 13:32:56 +0000 (13:32 +0000)]
Ahem. Finishing writing the comment _before_ checkin is generally sensible.

[originally from svn r7694]

16 years agoAllow a 1-omino to be completely destroyed and recreated in an
Simon Tatham [Sat, 18 Aug 2007 13:30:13 +0000 (13:30 +0000)]
Allow a 1-omino to be completely destroyed and recreated in an
arbitrary unclaimed square. This cures the most common cause of
generation failures (covering a large area in dominoes was the most
difficult case, and would fail even if the large area was 1xn!); the
failure rate is now sufficiently low under all circumstances I've
found that I'm willing to just loop until I get a success.

[originally from svn r7693]

16 years agoBetter test-mode diagnostics.
Simon Tatham [Sat, 18 Aug 2007 11:19:29 +0000 (11:19 +0000)]
Better test-mode diagnostics.

[originally from svn r7691]

16 years agoA piece of library code which constructs a random division of a
Simon Tatham [Sat, 18 Aug 2007 10:07:29 +0000 (10:07 +0000)]
A piece of library code which constructs a random division of a
rectangle into equally sized ominoes. I have a couple of potential
applications for this, but none I've actually implemented yet, so
for the moment it's living in `unfinished'.

[originally from svn r7690]

16 years agoExperimental UI tweak enabled by a hacky environment variable:
Simon Tatham [Tue, 31 Jul 2007 17:04:20 +0000 (17:04 +0000)]
Experimental UI tweak enabled by a hacky environment variable:
suppress the display of `this square can't be a light' blobs in a
lit square, on the grounds that we already know _lit_ squares can't
be lights. This makes the solved game look cleaner (I've always
thought the detritus of blobs on some but not all non-light squares
looked messy), but on the other hand it's slightly jarring during
play. So I'm checking it in, but as a configurable option which is
off by default.

[originally from svn r7656]

16 years agoA user points out that Loopy's solver relies on elements of the
Simon Tatham [Thu, 5 Jul 2007 18:57:50 +0000 (18:57 +0000)]
A user points out that Loopy's solver relies on elements of the
`clues' array being able to be -1, so we must explicitly declare it
as `signed char' or it will break on platforms whose default char is
unsigned.

[originally from svn r7636]

16 years agoOptimiser placation.
Simon Tatham [Fri, 29 Jun 2007 09:45:44 +0000 (09:45 +0000)]
Optimiser placation.

[originally from svn r7625]

17 years agoUpdates and improvements from Jonas Koelker.
Simon Tatham [Sun, 20 May 2007 14:28:48 +0000 (14:28 +0000)]
Updates and improvements from Jonas Koelker.

[originally from svn r7601]

17 years agoLeft puzzles.rc2 out of the tarball. Oops.
Simon Tatham [Sat, 19 May 2007 06:16:24 +0000 (06:16 +0000)]
Left puzzles.rc2 out of the tarball. Oops.

[originally from svn r7600]

17 years agoMore forgiving selection of dragging targets.
Simon Tatham [Sat, 12 May 2007 13:13:39 +0000 (13:13 +0000)]
More forgiving selection of dragging targets.

[originally from svn r7574]

17 years agoGraphics tweak: make the top-right and bottom-left corners of
Simon Tatham [Sat, 12 May 2007 11:51:39 +0000 (11:51 +0000)]
Graphics tweak: make the top-right and bottom-left corners of
everything look nicer.

[originally from svn r7573]

17 years agoIn-game user interface to the solver.
Simon Tatham [Sat, 12 May 2007 10:26:22 +0000 (10:26 +0000)]
In-game user interface to the solver.

[originally from svn r7572]

17 years agoFix tiny memory leak if you pressed Solve while part way through an
Simon Tatham [Sat, 12 May 2007 08:26:58 +0000 (08:26 +0000)]
Fix tiny memory leak if you pressed Solve while part way through an
existing solution path.

[originally from svn r7571]

17 years agoRemove the check for disconnected pieces; it's over-general and
Simon Tatham [Sat, 12 May 2007 08:14:37 +0000 (08:14 +0000)]
Remove the check for disconnected pieces; it's over-general and
triggers on a perfectly connected piece shaped like an inverted T.

[originally from svn r7570]

17 years agonoicon.rc was missing from the Unix source archive, which caused a
Simon Tatham [Thu, 10 May 2007 11:10:14 +0000 (11:10 +0000)]
noicon.rc was missing from the Unix source archive, which caused a
re-run of mkfiles.pl to fail.

[originally from svn r7567]

17 years agoStand-alone slidesolver.
Simon Tatham [Mon, 7 May 2007 19:36:19 +0000 (19:36 +0000)]
Stand-alone slidesolver.

[originally from svn r7558]

17 years agoAdd an optional move limit during game generation.
Simon Tatham [Mon, 7 May 2007 19:08:52 +0000 (19:08 +0000)]
Add an optional move limit during game generation.

[originally from svn r7554]

17 years agoSlight solver speedup by tracking more carefully which block merges
Simon Tatham [Mon, 7 May 2007 17:51:37 +0000 (17:51 +0000)]
Slight solver speedup by tracking more carefully which block merges
we've already tried, and not trying them again.

[originally from svn r7553]

17 years agoAdd a new misc.c function needed by Slide's colour setup.
Simon Tatham [Mon, 7 May 2007 17:50:14 +0000 (17:50 +0000)]
Add a new misc.c function needed by Slide's colour setup.

[originally from svn r7552]

17 years agoClose-to-finished auto-generating implementation of Klotski.
Simon Tatham [Mon, 7 May 2007 14:49:05 +0000 (14:49 +0000)]
Close-to-finished auto-generating implementation of Klotski.

[originally from svn r7547]

17 years agoI still haven't managed to get the WinCE port building via bob, but
Simon Tatham [Sun, 6 May 2007 09:54:34 +0000 (09:54 +0000)]
I still haven't managed to get the WinCE port building via bob, but
I should at least check in what I've got.

[originally from svn r7542]

17 years agoEnsure the shuffling process never produces an already-solved grid.
Simon Tatham [Wed, 4 Apr 2007 19:12:17 +0000 (19:12 +0000)]
Ensure the shuffling process never produces an already-solved grid.

[originally from svn r7446]

17 years agoIn the Windows frontend, stop tab navigation from activating buttons.
Jacob Nevins [Sat, 31 Mar 2007 16:00:50 +0000 (16:00 +0000)]
In the Windows frontend, stop tab navigation from activating buttons.

[originally from svn r7436]

17 years agoEr, and now do that _without_ introducing further segfaults.
Simon Tatham [Mon, 26 Mar 2007 10:24:25 +0000 (10:24 +0000)]
Er, and now do that _without_ introducing further segfaults.

[originally from svn r7409]

17 years agoStop failing assertions when we encounter an insoluble puzzle.
Simon Tatham [Mon, 26 Mar 2007 10:20:51 +0000 (10:20 +0000)]
Stop failing assertions when we encounter an insoluble puzzle.

[originally from svn r7408]

17 years agoKyle Brazell points out that the completion checker considers a
Simon Tatham [Fri, 23 Mar 2007 18:08:21 +0000 (18:08 +0000)]
Kyle Brazell points out that the completion checker considers a
region valid if it has _a_ dot at its centre of symmetry, even if
that dot isn't actually within the region in question.

[originally from svn r7407]

17 years agoDisallow clicks between squares.
Jacob Nevins [Fri, 16 Mar 2007 13:32:43 +0000 (13:32 +0000)]
Disallow clicks between squares.

[originally from svn r7400]

17 years agor7364 failed to expand a malloc to match the larger data being put
Simon Tatham [Sun, 11 Mar 2007 10:39:44 +0000 (10:39 +0000)]
r7364 failed to expand a malloc to match the larger data being put
in it.

[originally from svn r7387]
[r7364 == 39d299f579da3e91308d63acc78c68ab74666989]

17 years agoGary Wong observes that solo's decode_params() is overenthusiastic
Simon Tatham [Sun, 11 Mar 2007 10:12:45 +0000 (10:12 +0000)]
Gary Wong observes that solo's decode_params() is overenthusiastic
about eating the letter `d' (for `diagonal') when it appears in a
symmtery description: it should only be used after `m', because
mirror symmetry is the only type that can be diagonal. This was
causing parsing of the parameter description `3x3adu' to produce the
wrong answer: the d would be swallowed, then the u ignored for being
incomprehensible, and you'd get default Trivial difficulty.

[originally from svn r7386]

17 years agoGary Wong points out that solosolver's verbose output is
Simon Tatham [Sun, 11 Mar 2007 10:04:00 +0000 (10:04 +0000)]
Gary Wong points out that solosolver's verbose output is
inconsistent in whether it numbers rows and columns from zero or
from one. Standardise on one.

[originally from svn r7385]

17 years agoSince we've changed the semantics of the `expand' argument to midend_size(),
Jacob Nevins [Sat, 3 Mar 2007 23:43:22 +0000 (23:43 +0000)]
Since we've changed the semantics of the `expand' argument to midend_size(),
change the name. Also document the new semantics.

[originally from svn r7369]

17 years agoPatch from Ben Hutchings to allow user-initiated tilesize changes to persist
Jacob Nevins [Sat, 3 Mar 2007 23:17:35 +0000 (23:17 +0000)]
Patch from Ben Hutchings to allow user-initiated tilesize changes to persist
across changes in game parameters (e.g., changing difficulty without changing
size). This also has the effect of preserving the user-selected tilesize if the
grid size is changed. (From Debian bug#379452.)

[originally from svn r7368]

17 years agoBen Hutchings' patch to allow Gtk windows to be shrunk as well as grown
Jacob Nevins [Sat, 3 Mar 2007 22:39:17 +0000 (22:39 +0000)]
Ben Hutchings' patch to allow Gtk windows to be shrunk as well as grown
(from Debian bug#379452).
Tested on Gtk 2. I've been unable to find a Gtk+-1.2 installation on which
Puzzles compiles, so not tested there.

[originally from svn r7367]

17 years agoRefactoring patch from Ben Hutchings: move all the Gtk resize code into one
Jacob Nevins [Sat, 3 Mar 2007 22:05:05 +0000 (22:05 +0000)]
Refactoring patch from Ben Hutchings: move all the Gtk resize code into one
place. (From Debian bug#379452)

[originally from svn r7366]

17 years agoPatch from James H to provide resizability on Windows.
Simon Tatham [Sat, 3 Mar 2007 17:36:44 +0000 (17:36 +0000)]
Patch from James H to provide resizability on Windows.

[originally from svn r7364]

17 years agoMinor cleanups (mostly \ns in diagnostic printfs) from James H.
Simon Tatham [Sat, 3 Mar 2007 17:25:13 +0000 (17:25 +0000)]
Minor cleanups (mostly \ns in diagnostic printfs) from James H.

[originally from svn r7363]

17 years agoMy favourite kind of patch, from James H: one which decreases the
Simon Tatham [Sat, 3 Mar 2007 17:15:25 +0000 (17:15 +0000)]
My favourite kind of patch, from James H: one which decreases the
amount of code. James has ripped out the solver's version of
check_complete(), in favour of using the one I wrote for the
game-playing UI. My one checks connectedness, which means that the
solver will now not believe non-solutions to puzzles where
connectedness becomes a difficult issue. Examples of game IDs which
are now solved correctly but were previously not are 5x3:ubb and
7x7:ajfzmfqgtdzgt.

[originally from svn r7362]

17 years agoAbout time I got round to documenting the new
Simon Tatham [Sat, 3 Mar 2007 09:41:51 +0000 (09:41 +0000)]
About time I got round to documenting the new
REQUIRE_{RBUTTON,NUMPAD} flags.

[originally from svn r7356]

17 years agoFix problems with arrow UI with non-square grid.
Jacob Nevins [Fri, 2 Mar 2007 20:14:15 +0000 (20:14 +0000)]
Fix problems with arrow UI with non-square grid.

[originally from svn r7355]

17 years agoSilliness! Here's a somewhat hacky patch which builds an additional
Simon Tatham [Thu, 1 Mar 2007 18:57:36 +0000 (18:57 +0000)]
Silliness! Here's a somewhat hacky patch which builds an additional
binary from the Galaxies source file. The function of the new
`galaxiespicture' is to take a .xbm bitmap on standard input and
convert it into a Galaxies game ID using both black and white dots,
such that when solved the puzzle displays the input bitmap.

In the process of this I've implemented a post-processing pass after
the main game generation, to prevent clusters of adjacent
singletons. James H already solved that problem for unconstrained
game generation, but for some reason it came back when I did this.
However, the post-processing pass is still turned off for normal
usage, on the basis that (a) if it ain't broke don't fix it, and (b)
it's rather slow and best avoided if not necessary.

[originally from svn r7354]

17 years agoAmend README so that it makes reasonable sense no matter whether
Simon Tatham [Thu, 1 Mar 2007 13:29:53 +0000 (13:29 +0000)]
Amend README so that it makes reasonable sense no matter whether
you've got your source code from a tarball (with makefiles) or from
svn (without makefiles). While I'm here, mention Makefile.wce.

[originally from svn r7352]

17 years agoCleanup patch from James H: disable the `s' key, which was only in
Simon Tatham [Thu, 1 Mar 2007 07:41:11 +0000 (07:41 +0000)]
Cleanup patch from James H: disable the `s' key, which was only in
there by accident.

[originally from svn r7351]

17 years agoAdam D. Lopresto and Phil Bordelon independently point out a
Simon Tatham [Thu, 1 Mar 2007 07:39:05 +0000 (07:39 +0000)]
Adam D. Lopresto and Phil Bordelon independently point out a
signedness mismatch.

[originally from svn r7350]

17 years agoBound edge thicknesses below so that they're always thicker than the
Simon Tatham [Thu, 1 Mar 2007 07:32:35 +0000 (07:32 +0000)]
Bound edge thicknesses below so that they're always thicker than the
grid lines.

[originally from svn r7349]

17 years agoFix some border drawing issues.
Jacob Nevins [Wed, 28 Feb 2007 22:22:30 +0000 (22:22 +0000)]
Fix some border drawing issues.

[originally from svn r7347]

17 years agoMinGW windres doesn't like an empty resource file, so invent a resource to
Jacob Nevins [Wed, 28 Feb 2007 21:49:48 +0000 (21:49 +0000)]
MinGW windres doesn't like an empty resource file, so invent a resource to
keep it happy. (Hopefully this hack will be temporary.)

[originally from svn r7346]

17 years agoGeneral cleanups patch from James H:
Simon Tatham [Wed, 28 Feb 2007 21:19:15 +0000 (21:19 +0000)]
General cleanups patch from James H:
 - missing static in filling.c
 - better robustness in execute_move() in filling.c
 - remove side effects in assert statements
 - remove rogue diagnostic in galaxies.c
 - remove // comment in map.c
 - add more stylus-friendly UI to Pattern
 - bias Unequal towards generating inequality clues rather than numeric

[originally from svn r7344]

17 years agoGary Wong points out a couple of minor errors in the setting of
Simon Tatham [Wed, 28 Feb 2007 21:02:31 +0000 (21:02 +0000)]
Gary Wong points out a couple of minor errors in the setting of
`used_solve'.

[originally from svn r7343]

17 years agoProvide my old drag-based interface to Net as an ifdef-enabled
Simon Tatham [Tue, 27 Feb 2007 21:03:06 +0000 (21:03 +0000)]
Provide my old drag-based interface to Net as an ifdef-enabled
option, and turn it on by default on stylus-based platforms (i.e.
currently PocketPC).

[originally from svn r7341]

17 years agoAnother thing to watch out for when adding new puzzles.
Simon Tatham [Tue, 27 Feb 2007 20:52:03 +0000 (20:52 +0000)]
Another thing to watch out for when adding new puzzles.

[originally from svn r7340]

17 years agoCreate a blank .rc file to be used in the absence of icons/foo.rc.
Simon Tatham [Tue, 27 Feb 2007 20:49:40 +0000 (20:49 +0000)]
Create a blank .rc file to be used in the absence of icons/foo.rc.
This means that puzzles.rc2 is always included in all Windows and
PocketPC builds, which in turn means that I should be able to start
filling it full of VERSIONINFO and have that reliably included as
well.

[originally from svn r7339]

17 years agoThis game requires the numpad.
Simon Tatham [Tue, 27 Feb 2007 20:46:15 +0000 (20:46 +0000)]
This game requires the numpad.

[originally from svn r7338]

17 years agoDariusz Olszewski's changes to support compiling for PocketPC. This
Simon Tatham [Mon, 26 Feb 2007 20:35:47 +0000 (20:35 +0000)]
Dariusz Olszewski's changes to support compiling for PocketPC. This
is mostly done with ifdefs in windows.c; so mkfiles.pl generates a
new makefile (Makefile.wce) and Recipe enables it, but it's hardly
any different from Makefile.vc apart from a few definitions at the
top of the files.

Currently the PocketPC build is not enabled in the build script, but
with any luck I'll be able to do so reasonably soon.

[originally from svn r7337]