From a943f3177f4adc591a282bdc62eef80675dc2a67 Mon Sep 17 00:00:00 2001 From: Ben Harris Date: Sun, 4 Jun 2023 19:02:21 +0100 Subject: Add MOVE_NO_EFFECT and MOVE_UNUSED return values from interpret_move() These allow for distinguishing the case where a puzzle doesn't have a use for a key from the case where it just happens to have no effect in the current state of the puzzle. These were both represented by NULL, but that now represents the case where a puzzle hasn't been updated to make the distinction yet. --- midend.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'midend.c') diff --git a/midend.c b/midend.c index 5de84c0..1064af3 100644 --- a/midend.c +++ b/midend.c @@ -990,7 +990,7 @@ static bool midend_really_process_key(midend *me, int x, int y, int button, me->ui, me->drawstate, x, y, button); } - if (!movestr) { + if (movestr == NULL || movestr == MOVE_UNUSED) { if ((me->one_key_shortcuts && (button == 'n' || button == 'N')) || button == '\x0E' || button == UI_NEWGAME) { midend_new_game(me); @@ -1025,6 +1025,8 @@ static bool midend_really_process_key(midend *me, int x, int y, int button, goto done; } else goto done; + } else if (movestr == MOVE_NO_EFFECT) { + goto done; } else { *handled = true; if (movestr == MOVE_UI_UPDATE) -- cgit v1.1