nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

addinv_nomerge()

Browse Source 
Replace several instances of
 obj->nomerge = 1;
 addinv(obj);
 obj->nomerge = 0;
with new
 addinv_nomerge(obj);
and add various related comments.
This commit is contained in:
PatR
2023-09-19 14:40:33 -07:00
parent 3fdcd5f4e0
commit dd05f5183e
8 changed files with 42 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/apply.c
View File

@@ -1,4 +1,4 @@
/* NetHack 3.7 apply.c $NHDT-Date: 1685202442 2023/05/27 15:47:22 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.420 $ */
/* NetHack 3.7 apply.c $NHDT-Date: 1695159606 2023/09/19 21:40:06 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.422 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/*-Copyright (c) Robert Patrick Rankin, 2012. */
/* NetHack may be freely redistributed. See license for details. */
@@ -3499,9 +3499,7 @@ use_royal_jelly(struct obj **optr)
update_inventory(); /* freeinv() updated perminv w/ obj omitted */
} else {
/* this lump was already separate; pervent merge */
obj->nomerge = 1;
addinv(obj); /* put the unused lump back; updates perminv */
obj->nomerge = 0;
addinv_nomerge(obj); /* put unused lump back; updates perminv */
}
return ECMD_CANCEL;
}