Test consolidation

[open-adventure.git] / actions.c

diff --git a/actions.c b/actions.c
index 6cff55ced3181400525f8601eb8ead9f5e1659da..c4d86b48ca42201318140bc294bb8238071d4488 100644 (file)
--- a/actions.c
+++ b/actions.c
@@ -253,7 +253,7 @@ static int vbreak(verb_t verb, obj_t obj)
     switch (obj) {
     case MIRROR:
         if (game.closed) {
-            rspeak(BREAK_MIRROR);
+            state_change(MIRROR, MIRROR_BROKEN);
             return GO_DWARFWAKE;
         } else {
             rspeak(TOO_FAR);
@@ -545,9 +545,7 @@ static int discard(verb_t verb, obj_t obj)
         } else
             rspeak(OK_MAN);
 
-        game.prop[BIRD] = BIRD_UNCAGED;
-        if (FOREST(game.loc))
-            game.prop[BIRD] = BIRD_FOREST_UNCAGED;
+       game.prop[BIRD] = FOREST(game.loc) ? BIRD_FOREST_UNCAGED : BIRD_UNCAGED;
         drop(obj, game.loc);
         return GO_CLEAROBJ;
     }