archives/open-adventure
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

All travel[] references are now wrapped in extractor/predicate macros.

Browse source 
This is a step toward pulling the magic numbers apart into data structures
so there will be fewer magic numbers in the code.
This commit is contained in:
Eric S. Raymond 2017-06-27 21:55:29 -04:00
parent f6cd34f778
commit d53f125555
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
main.c
View file

@ -38,6 +38,7 @@
#define L_SPEAK(loc) ((loc) - 500) #define L_SPEAK(loc) ((loc) - 500)
#define T_TERMINATE(entry) (T_MOTION(entry) == 1) #define T_TERMINATE(entry) (T_MOTION(entry) == 1)
#define T_STOP(entry) ((entry) < 0) #define T_STOP(entry) ((entry) < 0)
#define T_OPCODE(entry) (entry)
struct game_t game; struct game_t game;
@ -618,7 +619,7 @@ static bool playermove(token_t verb, int motion)
} }
++kk; ++kk;
} }
scratchloc = labs(travel[kk]) / 1000; scratchloc = labs(T_OPCODE(travel[kk])) / 1000;
do { do {
/* /*
@ -647,7 +648,7 @@ static bool playermove(token_t verb, int motion)
if (T_STOP(travel[kk])) if (T_STOP(travel[kk]))
BUG(CONDITIONAL_TRAVEL_ENTRY_WITH_NO_ALTERATION); BUG(CONDITIONAL_TRAVEL_ENTRY_WITH_NO_ALTERATION);
++kk; ++kk;
game.newloc = labs(travel[kk]) / 1000; game.newloc = labs(T_OPCODE(travel[kk])) / 1000;
} while } while
(game.newloc == scratchloc); (game.newloc == scratchloc);
scratchloc = game.newloc; scratchloc = game.newloc;
@ -688,7 +689,7 @@ static bool playermove(token_t verb, int motion)
if (T_STOP(travel[kk])) if (T_STOP(travel[kk]))
BUG(CONDITIONAL_TRAVEL_ENTRY_WITH_NO_ALTERATION); BUG(CONDITIONAL_TRAVEL_ENTRY_WITH_NO_ALTERATION);
++kk; ++kk;
game.newloc = labs(travel[kk]) / 1000; game.newloc = labs(T_OPCODE(travel[kk])) / 1000;
} while } while
(game.newloc == scratchloc); (game.newloc == scratchloc);
scratchloc = game.newloc; scratchloc = game.newloc;