aboutsummaryrefslogtreecommitdiff
path: root/unequal.c
diff options
context:
space:
mode:
authorSimon Tatham <anakin@pobox.com>2007-02-26 20:35:47 +0000
committerSimon Tatham <anakin@pobox.com>2007-02-26 20:35:47 +0000
commit15f70f527a0a753285e3fa871bd4018e547fbb05 (patch)
treed34aebfc6c8e4ad48f0c1aeabbbaff7432e5cc24 /unequal.c
parent3bfe0fb32eae41dcc213e1cef860ec421cc2540c (diff)
downloadpuzzles-15f70f527a0a753285e3fa871bd4018e547fbb05.zip
puzzles-15f70f527a0a753285e3fa871bd4018e547fbb05.tar.gz
puzzles-15f70f527a0a753285e3fa871bd4018e547fbb05.tar.bz2
puzzles-15f70f527a0a753285e3fa871bd4018e547fbb05.tar.xz
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]
Diffstat (limited to 'unequal.c')
-rw-r--r--unequal.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/unequal.c b/unequal.c
index 81720e4..8006ea1 100644
--- a/unequal.c
+++ b/unequal.c
@@ -26,6 +26,11 @@
#include "puzzles.h"
#include "latin.h" /* contains typedef for digit */
+static void assert_f(p)
+{
+ assert(p);
+}
+
/* ----------------------------------------------------------
* Constant and structure definitions
*/
@@ -971,7 +976,7 @@ static void game_strip(game_state *new, int *scratch, digit *latin,
gg_solved++;
if (solver_state(copy, difficulty) != 1) {
/* put clue back, we can't solve without it. */
- assert(gg_place_clue(new, scratch[i], latin, 0) == 1);
+ assert_f(gg_place_clue(new, scratch[i], latin, 0) == 1);
} else {
#ifdef STANDALONE_SOLVER
if (solver_show_working)
@@ -1355,7 +1360,7 @@ static game_state *execute_move(game_state *state, char *move)
p++;
}
if (*p) goto badmove;
- assert(check_complete(ret->nums, ret, 1) > 0);
+ assert_f(check_complete(ret->nums, ret, 1) > 0);
return ret;
} else if (move[0] == 'H') {
return solver_hint(state, NULL, DIFF_EASY, DIFF_EASY);
@@ -1748,7 +1753,7 @@ const struct game thegame = {
TRUE, FALSE, game_print_size, game_print,
FALSE, /* wants_statusbar */
FALSE, game_timing_state,
- 0, /* flags */
+ REQUIRE_RBUTTON | REQUIRE_NUMPAD, /* flags */
};
/* ----------------------------------------------------------------------