X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=actions.c;h=de888d4584d1f1528378324ff5b3f50f84e22d3c;hb=248fc90e3d2cb0c3e2bcc6cace7d11d4ff763db0;hp=b079bd352f863da9e3dab42a30da543b34efa5a9;hpb=393010ec41c3c6c25fab05284a76c51ac3135a7b;p=open-adventure.git

diff --git a/actions.c b/actions.c
index b079bd3..de888d4 100644
--- a/actions.c
+++ b/actions.c
@@ -482,13 +482,12 @@ static int discard(token_t verb, token_t obj, bool just_do_it)
             DESTROY(BIRD);
             return GO_CLEAROBJ;
         } else if (obj == BEAR && AT(TROLL)) {
-            rspeak(TROLL_SCAMPERS);
+            state_change(TROLL, TROLL_GONE);
             move(TROLL, LOC_NOWHERE);
             move(TROLL + NOBJECTS, LOC_NOWHERE);
             move(TROLL2, objects[TROLL].plac);
             move(TROLL2 + NOBJECTS, objects[TROLL].fixd);
             juggle(CHASM);
-            game.prop[TROLL] = TROLL_GONE;
         } else if (obj != VASE ||
                    game.loc == objects[PILLOW].plac) {
             rspeak(OK_MAN);
@@ -943,15 +942,15 @@ static int pour(token_t verb, token_t obj)
         return GO_CLEAROBJ;
     }
     if (!AT(DOOR)) {
-        if (obj != WATER) {
+        if (obj == WATER) {
+	    /* cycle through the three plant states */
+	    state_change(PLANT, MOD(game.prop[PLANT] + 1, 3));
+	    game.prop[PLANT2] = game.prop[PLANT];
+	    return GO_MOVE;
+        } else {
             rspeak(SHAKING_LEAVES);
             return GO_CLEAROBJ;
-        }
-        /* FIXME: Arithmetic on state numbers */
-        pspeak(PLANT, look, game.prop[PLANT] + 3, true);
-        game.prop[PLANT] = MOD(game.prop[PLANT] + 1, 3);
-        game.prop[PLANT2] = game.prop[PLANT];
-        return GO_MOVE;
+	}
     } else {
         state_change(DOOR, (obj == OIL) ?
                      DOOR_UNRUSTED :