From: Eric S. Raymond Date: Tue, 19 Apr 2022 21:07:46 +0000 (-0400) Subject: Magic-number elimination. X-Git-Tag: 1.12~14 X-Git-Url: https://jxself.org/git/?a=commitdiff_plain;h=67a887f432fa175300e6d51069587175dee76e17;p=open-adventure.git Magic-number elimination. --- diff --git a/init.c b/init.c index a897936..9333df3 100644 --- a/init.c +++ b/init.c @@ -60,7 +60,7 @@ int initialise(void) if (!(locations[i].description.big == 0 || tkey[i] == 0)) { int k = tkey[i]; - if (T_TERMINATE(travel[k])) + if (travel[k].motion == HERE) conditions[i] |= (1 << COND_FORCED); } } diff --git a/main.c b/main.c index 809574b..b3a8f95 100644 --- a/main.c +++ b/main.c @@ -656,7 +656,7 @@ static void playermove(int motion) /* Look for a way to fulfil the motion verb passed in - travel_entry indexes * the beginning of the motion entries for here (game.loc). */ for (;;) { - if (T_TERMINATE(travel[travel_entry]) || + if ((travel[travel_entry].motion == HERE) || travel[travel_entry].motion == motion) break; if (travel[travel_entry].stop) { diff --git a/templates/dungeon.h.tpl b/templates/dungeon.h.tpl index 8c07ed5..66d65ab 100644 --- a/templates/dungeon.h.tpl +++ b/templates/dungeon.h.tpl @@ -104,13 +104,6 @@ typedef struct {{ const bool stop; }} travelop_t; -/* Abstract out the encoding of words in the travel array. Gives us - * some hope of getting to a less cryptic representation than we - * inherited from FORTRAN, someday. To understand these, read the - * encoding description for travel. - */ -#define T_TERMINATE(entry) ((entry).motion == 1) - extern const location_t locations[]; extern const object_t objects[]; extern const char* arbitrary_messages[];