From 5d32958e045931d252a43c65a07d119d7432bd9f Mon Sep 17 00:00:00 2001 From: cohrs Date: Wed, 28 Jan 2004 17:49:21 +0000 Subject: [PATCH] dipping acid in a fountain reported that dipping acid in a fountain did not always destroy the acid. It might be best to have get_wet call useup in this case, but that would require more work. --- doc/fixes34.4 | 1 + src/fountain.c | 11 +++++------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/doc/fixes34.4 b/doc/fixes34.4 index 6cec3d411..d63b4567a 100644 --- a/doc/fixes34.4 +++ b/doc/fixes34.4 @@ -18,6 +18,7 @@ grammar of messages regarding eating artifacts avoid a message about an invisible monster looking much better player polymorphed as a xorn could not pick up items in pits don't display "turns to flee" message for a mimicing mimic +dipping acid in a fountain could cause an explosion but not destroy the potion Platform- and/or Interface-Specific Fixes diff --git a/src/fountain.c b/src/fountain.c index 6cc8c1a5d..e585a3450 100644 --- a/src/fountain.c +++ b/src/fountain.c @@ -391,13 +391,12 @@ register struct obj *obj; if(in_town(u.ux, u.uy)) (void) angry_guards(FALSE); return; - } else if (get_wet(obj) && !rn2(2)) + } else if (get_wet(obj)) { + if (obj->otyp == POT_ACID) { /* Acid and water don't mix */ + useup(obj); + return; + } else if (!rn2(2)) /* no further effect */ return; - - /* Acid and water don't mix */ - if (obj->otyp == POT_ACID) { - useup(obj); - return; } switch (rnd(30)) {