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

No spk remains in the code base

Browse source
This commit is contained in:
NHOrus 2017-07-13 20:44:18 +03:00 • committed by Eric S. Raymond
parent 761d660cd2
commit 49d9ef1bee
2 changed files with 36 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

10
actions.c
View file

@ -477,15 +477,13 @@ static int discard(verb_t verb, obj_t obj)
game.prop[CAVITY] = CAVITY_FULL;
if (HERE(RUG) && ((obj == EMERALD && game.prop[RUG] != RUG_HOVER) ||
(obj == RUBY && game.prop[RUG] == RUG_HOVER))) {
int spk;
if (obj == RUBY)
spk = RUG_SETTLES;
rspeak(RUG_SETTLES);
else if (TOTING(RUG))
spk = RUG_WIGGLES;
rspeak(RUG_WIGGLES);
else
spk = RUG_RISES;
rspeak(spk);
if (spk != RUG_WIGGLES) {
rspeak(RUG_RISES);
if (!TOTING(RUG) || obj == RUBY) {
int k = (game.prop[RUG] == RUG_HOVER) ? RUG_FLOOR : RUG_HOVER;
game.prop[RUG] = k;
if (k == RUG_HOVER)