From 7281c398071dc61b28a9251f2044315eba5394ea Mon Sep 17 00:00:00 2001 From: "Eric S. Raymond" Date: Wed, 28 Jun 2017 20:24:29 -0400 Subject: [PATCH] Improve documentation if the *most* obscure span of code. --- main.c | 16 ++++++++++------ newdungeon.py | 3 ++- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/main.c b/main.c index 8f98db5..75cdf37 100644 --- a/main.c +++ b/main.c @@ -625,20 +625,24 @@ static bool playermove(token_t verb, int motion) for (;;) { /* L12 loop */ for (;;) { game.newloc = scratchloc / 1000; - motion = MOD(game.newloc, 100); + long arg = MOD(game.newloc, 100); if (!SPECIAL(game.newloc)) { + /* YAML N and [pct N] conditionals */ if (game.newloc <= 100) { if (game.newloc == 0 || PCT(game.newloc)) break; /* else fall through */ } - /* handles the YAML "with" clause */ - if (TOTING(motion) || (game.newloc > 200 && AT(motion))) + /* YAML [with OBJ] clause */ + if (TOTING(arg) || (game.newloc > 200 && AT(arg))) break; - /* else fall through */ - } else if (game.prop[motion] != game.newloc / 100 - 3) + /* else fall through to check [not OBJ STATE] */ + } else if (game.prop[arg] != game.newloc / 100 - 3) break; - do { + + /* We arrive here on conditional failure. + * Skip to next non-matching destination */ + do { if (travel[kk].stop) BUG(CONDITIONAL_TRAVEL_ENTRY_WITH_NO_ALTERATION); // LCOV_EXCL_LINE ++kk; diff --git a/newdungeon.py b/newdungeon.py index f2e801f..022580c 100755 --- a/newdungeon.py +++ b/newdungeon.py @@ -150,7 +150,8 @@ typedef struct {{ * encoding description for travel. */ #define T_DESTINATION(entry) MOD((entry).dest, 1000) -#define T_NODWARVES(entry) ((entry).dest / 1000 == 100) +#define T_CONDITION(entry) ((entry).dest / 1000) +#define T_NODWARVES(entry) (T_CONDITION(entry) == 100) #define T_HIGH(entry) ((entry).dest) #define T_TERMINATE(entry) ((entry).motion == 1) #define L_SPEAK(loc) ((loc) - 500) -- 2.31.1