From 0dd715da114360a73a90ad3aad2933e3015b9837 Mon Sep 17 00:00:00 2001 From: Pasi Kallinen Date: Tue, 5 May 2015 06:55:56 +0300 Subject: [PATCH] Revert previous, with a comment in code --- src/do.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/do.c b/src/do.c index d85859353..75cf52cf2 100644 --- a/src/do.c +++ b/src/do.c @@ -218,7 +218,8 @@ const char *verb; /* Globby things like puddings might stick together */ while (obj && (otmp = obj_nexto_xy(obj->otyp, x, y, obj->o_id)) != (struct obj*)0) { pudding_merge_message(obj, otmp); - obj = obj_meld(&obj, &otmp); + /* intentionally not getting the melded object; obj_meld may set obj to null. */ + (void) obj_meld(&obj, &otmp); } return (obj == NULL); }