One bit less math on states
authorNHOrus <jy6x2b32pie9@yahoo.com>
Wed, 5 Jul 2017 16:33:01 +0000 (19:33 +0300)
committerEric S. Raymond <esr@thyrsus.com>
Wed, 5 Jul 2017 19:41:36 +0000 (15:41 -0400)
actions.c

index f73fa5c29c69baf907255998d3d2b3821c5ec0e3..971bbb349cee39fb9c5398b1dcf18e7d26417dd1 100644 (file)
--- a/actions.c
+++ b/actions.c
@@ -469,7 +469,7 @@ static int discard(token_t verb, token_t obj, bool just_do_it)
                 rspeak(spk);
                 if (spk != RUG_WIGGLES) {
                     /* FIXME: Arithmetic on state numbers */
-                    int k = 2 - game.prop[RUG];
+                    int k = (game.prop[RUG] == RUG_HOVER) ? RUG_FLOOR : RUG_HOVER;
                     game.prop[RUG] = k;
                     if (k == RUG_HOVER)
                         k = objects[SAPPH].plac;