X-Git-Url: https://jxself.org/git/?p=open-adventure.git;a=blobdiff_plain;f=actions.c;h=40a1928f62d99299970e9a07fef2775cd59196f1;hp=0e6dd7ad69836045cfb6d3785a070d773a4bfecf;hb=49d9ef1bee7b11055b7a46e2c2b45bd888e1ccef;hpb=761d660cd260f7d8605d64ccdc06f35cb0eb7e18 diff --git a/actions.c b/actions.c index 0e6dd7a..40a1928 100644 --- a/actions.c +++ b/actions.c @@ -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)