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

Magic-number elimination.

Browse source
This commit is contained in:
Eric S. Raymond 2017-07-02 15:32:50 -04:00
parent c811512a82
commit 89e1833d8f
2 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

11
actions.c
View file

@ -639,7 +639,7 @@ int fill(token_t verb, token_t obj)
return (discard(verb, obj, true)); return (discard(verb, obj, true));
} else if (obj == URN) { } else if (obj == URN) {
spk = FULL_URN; spk = FULL_URN;
if (game.prop[URN] != 0) { if (game.prop[URN] != URN_EMPTY) {
rspeak(spk); rspeak(spk);
return GO_CLEAROBJ; return GO_CLEAROBJ;
} }
@ -652,7 +652,7 @@ int fill(token_t verb, token_t obj)
game.place[k] = LOC_NOWHERE; game.place[k] = LOC_NOWHERE;
game.prop[BOTTLE] = EMPTY_BOTTLE; game.prop[BOTTLE] = EMPTY_BOTTLE;
if (k == OIL) if (k == OIL)
game.prop[URN] = 1; game.prop[URN] = URN_DARK;
spk = WATER_URN + game.prop[URN]; spk = WATER_URN + game.prop[URN];
rspeak(spk); rspeak(spk);
return GO_CLEAROBJ; return GO_CLEAROBJ;
@ -664,7 +664,7 @@ int fill(token_t verb, token_t obj)
spk = BOTTLED_WATER; spk = BOTTLED_WATER;
if (LIQLOC(game.loc) == 0) if (LIQLOC(game.loc) == 0)
spk = NO_LIQUID; spk = NO_LIQUID;
if (HERE(URN) && game.prop[URN] != 0) if (HERE(URN) && game.prop[URN] != URN_EMPTY)
spk = URN_NOPOUR; spk = URN_NOPOUR;
if (LIQUID() != 0) if (LIQUID() != 0)
spk = BOTTLE_FULL; spk = BOTTLE_FULL;
@ -974,7 +974,7 @@ static int rub(token_t verb, token_t obj)
if (obj == URN && game.prop[URN] == URN_LIT) { if (obj == URN && game.prop[URN] == URN_LIT) {
DESTROY(URN); DESTROY(URN);
drop(AMBER, game.loc); drop(AMBER, game.loc);
game.prop[AMBER] = 1; game.prop[AMBER] = AMBER_IN_ROCK;
--game.tally; --game.tally;
drop(CAVITY, game.loc); drop(CAVITY, game.loc);
spk = URN_GENIES; spk = URN_GENIES;
@ -992,12 +992,11 @@ static int say(struct command_t *command)
b = command->wd2x; b = command->wd2x;
command->wd1 = command->wd2; command->wd1 = command->wd2;
} }
//int wd = vocab(command->wd1, -1);
char word1[6]; char word1[6];
packed_to_token(command->wd1, word1); packed_to_token(command->wd1, word1);
int wd = (int) get_vocab_id(word1); int wd = (int) get_vocab_id(word1);
/* FIXME: magic numbers */ /* FIXME: magic numbers */
if (wd == XYZZY || wd == PLUGH || wd == PLOVER || wd == ACTION_WORD(GIANTWORDS) || wd == ACTION_WORD(PART)) { if (wd == MOTION_WORD(XYZZY) || wd == MOTION_WORD(PLUGH) || wd == MOTION_WORD(PLOVER) || wd == ACTION_WORD(GIANTWORDS) || wd == ACTION_WORD(PART)) {
/* FIXME: scribbles on the interpreter's command block */ /* FIXME: scribbles on the interpreter's command block */
wordclear(&command->wd2); wordclear(&command->wd2);
return GO_LOOKUP; return GO_LOOKUP;

4
adventure.yaml
View file

@ -3784,8 +3784,8 @@ objects: !!omap
locations: LOC_NOWHERE locations: LOC_NOWHERE
treasure: true treasure: true
descriptions: descriptions:
- 'There is a rare amber gemstone here!' - [AMBER_IN_URN, 'There is a rare amber gemstone here!']
- 'There is an amber gemstone resting in a small cavity in the rock!' - [AMBER_IN_ROCK, 'There is an amber gemstone resting in a small cavity in the rock!']
- SAPPH: - SAPPH:
words: ['sapph'] words: ['sapph']
inventory: 'Star sapphire' inventory: 'Star sapphire'