From 6166d687b98e21bce25fb6e910ffc31441648688 Mon Sep 17 00:00:00 2001 From: "Eric S. Raymond" Date: Tue, 13 Jun 2017 11:28:53 -0400 Subject: [PATCH] Code simplification. --- actions.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/actions.c b/actions.c index eb7e13c..1e1e223 100644 --- a/actions.c +++ b/actions.c @@ -392,13 +392,11 @@ static int drink(token_t verb, token_t obj) return(8000); if (obj != BLOOD) { if (obj != 0 && obj != WATER)spk=110; - if (spk == 110 || LIQUID() != WATER || !HERE(BOTTLE)) { - RSPEAK(spk); - return GO_CLEAROBJ; + if (spk != 110 && LIQUID() == WATER && HERE(BOTTLE)) { + game.prop[BOTTLE]=1; + game.place[WATER]=0; + spk=74; } - game.prop[BOTTLE]=1; - game.place[WATER]=0; - spk=74; } else { DSTROY(BLOOD); game.prop[DRAGON]=2; -- 2.31.1