projects
/
nethack
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
766d874
)
Revert previous, with a comment in code
author
Pasi Kallinen
<paxed@alt.org>
Tue, 5 May 2015 03:55:56 +0000
(06:55 +0300)
committer
Pasi Kallinen
<paxed@alt.org>
Tue, 5 May 2015 03:55:56 +0000
(06:55 +0300)
src/do.c
patch
|
blob
|
history
diff --git
a/src/do.c
b/src/do.c
index d8585935322666faf6a034629231119d685cb65f..75cf52cf264e40d923892aa1b228ae2a3a42d0d4 100644
(file)
--- 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);
}