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

Merge branch 'NetHack-3.6'

Browse Source
This commit is contained in:
nhmall
2019-05-18 16:30:43 -04:00
parent c33f17940c 670fc9ca34
commit 8e972874b2
9 changed files with 220 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/invent.c
View File

@@ -3569,11 +3569,7 @@ register struct obj *otmp, *obj;
if (obj->oclass == COIN_CLASS)
return TRUE;
if (obj->unpaid != otmp->unpaid || obj->spe != otmp->spe
|| obj->cursed != otmp->cursed || obj->blessed != otmp->blessed
|| obj->no_charge != otmp->no_charge || obj->obroken != otmp->obroken
|| obj->otrapped != otmp->otrapped || obj->lamplit != otmp->lamplit
|| obj->bypass != otmp->bypass)
if (obj->bypass != otmp->bypass)
return FALSE;
if (obj->globby)
@@ -3582,6 +3578,12 @@ register struct obj *otmp, *obj;
* or don't inhibit their merger.
*/
if (obj->unpaid != otmp->unpaid || obj->spe != otmp->spe
|| obj->cursed != otmp->cursed || obj->blessed != otmp->blessed
|| obj->no_charge != otmp->no_charge || obj->obroken != otmp->obroken
|| obj->otrapped != otmp->otrapped || obj->lamplit != otmp->lamplit)
return FALSE;
if (obj->oclass == FOOD_CLASS
&& (obj->oeaten != otmp->oeaten || obj->orotten != otmp->orotten))
return FALSE;