More magic-number removal.
This commit is contained in:
parent
b5260417dd
commit
d96d5db51f
2 changed files with 6 additions and 6 deletions
|
@ -288,7 +288,7 @@ static int vcarry(token_t verb, token_t obj)
|
||||||
game.place[LIQUID()] = CARRIED;
|
game.place[LIQUID()] = CARRIED;
|
||||||
if (GSTONE(obj) && game.prop[obj] != 0) {
|
if (GSTONE(obj) && game.prop[obj] != 0) {
|
||||||
game.prop[obj] = 0;
|
game.prop[obj] = 0;
|
||||||
game.prop[CAVITY] = 1;
|
game.prop[CAVITY] = CAVITY_EMPTY;
|
||||||
}
|
}
|
||||||
rspeak(OK_MAN);
|
rspeak(OK_MAN);
|
||||||
return GO_CLEAROBJ;
|
return GO_CLEAROBJ;
|
||||||
|
@ -350,12 +350,12 @@ static int discard(token_t verb, token_t obj, bool just_do_it)
|
||||||
if (game.closed) return GO_DWARFWAKE;
|
if (game.closed) return GO_DWARFWAKE;
|
||||||
DESTROY(SNAKE);
|
DESTROY(SNAKE);
|
||||||
/* Set game.prop for use by travel options */
|
/* Set game.prop for use by travel options */
|
||||||
game.prop[SNAKE] = 1;
|
game.prop[SNAKE] = SNAKE_CHASED;
|
||||||
|
|
||||||
} else if ((GSTONE(obj) && AT(CAVITY) && game.prop[CAVITY] != 0)) {
|
} else if ((GSTONE(obj) && AT(CAVITY) && game.prop[CAVITY] != CAVITY_FULL)) {
|
||||||
rspeak(GEM_FITS);
|
rspeak(GEM_FITS);
|
||||||
game.prop[obj] = 1;
|
game.prop[obj] = 1;
|
||||||
game.prop[CAVITY] = 0;
|
game.prop[CAVITY] = CAVITY_FULL;
|
||||||
if (HERE(RUG) && ((obj == EMERALD && game.prop[RUG] != 2) || (obj == RUBY &&
|
if (HERE(RUG) && ((obj == EMERALD && game.prop[RUG] != 2) || (obj == RUBY &&
|
||||||
game.prop[RUG] == 2))) {
|
game.prop[RUG] == 2))) {
|
||||||
spk = RUG_RISES;
|
spk = RUG_RISES;
|
||||||
|
|
|
@ -3363,8 +3363,8 @@ objects: !!omap
|
||||||
locations: LOC_NOWHERE
|
locations: LOC_NOWHERE
|
||||||
immovable: true
|
immovable: true
|
||||||
descriptions:
|
descriptions:
|
||||||
- '' # something in it
|
- [CAVITY_FULL, ''] # something in it
|
||||||
- 'There is a small urn-shaped cavity in the rock.'
|
- [CAVITY_EMPTY, 'There is a small urn-shaped cavity in the rock.']
|
||||||
- BLOOD:
|
- BLOOD:
|
||||||
words: ['blood']
|
words: ['blood']
|
||||||
inventory: '*blood'
|
inventory: '*blood'
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue