From 5de69c22b0ff037f648a740a7c01869e78587df2 Mon Sep 17 00:00:00 2001 From: Franklin Wei Date: Sun, 21 Jul 2024 18:06:37 -0400 Subject: Refactor `button & ~MOD_MASK' as `STRIP_BUTTON_MODIFIERS(button)'. This refactors all instances of bitwise-ANDs with `~MOD_MASK'. There is a handful of more complex instances I left unchanged (in cube.c, midend.c, and twiddle.c), since those AND with `~MOD_MASK | MOD_NUM_KEYPAD' or similar. I don't think it's worth writing a macro for those cases. Also document this new macro's usage in devel.but. --- unequal.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'unequal.c') diff --git a/unequal.c b/unequal.c index c2f7311..ab32e4a 100644 --- a/unequal.c +++ b/unequal.c @@ -1530,7 +1530,7 @@ static char *interpret_move(const game_state *state, game_ui *ui, char buf[80]; bool shift_or_control = button & (MOD_SHFT | MOD_CTRL); - button &= ~MOD_MASK; + button = STRIP_BUTTON_MODIFIERS(button); if (x >= 0 && x < ds->order && y >= 0 && y < ds->order && IS_MOUSE_DOWN(button)) { if (oy - COORD(y) > TILE_SIZE && ox - COORD(x) > TILE_SIZE) -- cgit v1.1