From d8d506455ebe69888dcc4759eb9fc787bfe29ad9 Mon Sep 17 00:00:00 2001 From: Jacob Nevins Date: Sun, 23 Sep 2018 16:36:30 +0100 Subject: [PATCH] Net: highlight more errors in locked tiles. If a locked tile has an edge pointing at a barrier, or at another locked tile without a matching edge, colour that edge red. --- net.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/net.c b/net.c index 905297d..8757ce3 100644 --- a/net.c +++ b/net.c @@ -2915,7 +2915,25 @@ static void game_redraw(drawing *dr, game_drawstate *ds, } if (t & d) { - int edgeval = (t & ERR(d) ? 3 : t & ACTIVE ? 2 : 1); + int edgeval; + + /* Highlight as an error any edge in a locked tile that + * is adjacent to a lack-of-edge in another locked tile, + * or to a barrier */ + if (t & LOCKED) { + if (barrier(state, gx, gy) & d) { + t |= ERR(d); + } else { + int ox, oy, t2; + OFFSET(ox, oy, gx, gy, d, state); + t2 = tile(state, ox, oy); + if ((t2 & LOCKED) && !(t2 & F(d))) { + t |= ERR(d); + } + } + } + + edgeval = (t & ERR(d) ? 3 : t & ACTIVE ? 2 : 1); todraw(ds, dx, dy) |= edgeval << (TILE_WIRE_SHIFT + dsh*2); if (!(gx == tx && gy == ty)) { todraw(ds, dx + X(d), dy + Y(d)) |= -- 2.30.2