Revert previous, with a comment in code

This commit is contained in:
Pasi Kallinen
2015-05-05 06:55:56 +03:00
parent 766d874a47
commit 0dd715da11
+2 -1
View File
@@ -218,7 +218,8 @@ const char *verb;
/* Globby things like puddings might stick together */ /* Globby things like puddings might stick together */
while (obj && (otmp = obj_nexto_xy(obj->otyp, x, y, obj->o_id)) != (struct obj*)0) { while (obj && (otmp = obj_nexto_xy(obj->otyp, x, y, obj->o_id)) != (struct obj*)0) {
pudding_merge_message(obj, otmp); 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); return (obj == NULL);
} }