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

don't merge globs with differing BUC status

Browse Source
This commit is contained in:
nhmall
2019-05-18 22:56:27 -04:00
parent 336908ad3c
commit 8aac36c073
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
doc/fixes36.3
View File

@@ -1,4 +1,4 @@
$NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.5 $ $NHDT-Date: 1558171542 2019/05/18 09:25:42 $
$NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.7 $ $NHDT-Date: 1558234580 2019/05/19 02:56:20 $
This fixes36.3 file is here to capture information about updates in the 3.6.x
lineage following the release of 3.6.2 in May 2019. Please note, however,
@@ -15,11 +15,11 @@ when examining the map with '/' or ';', picking a symbol which is used for
more than 4 things yielded a sentence lacking its terminating period
billing and payment issue as a result of glob coalescing
glob pricing did not consider weight properly
glob shop interaction improved to handle more of the expected scenarios
Fixes to Post-3.6.2 Problems that Were Exposed Via git Repository
------------------------------------------------------------------
glob shop interaction improved to handle more of the expected scenarios
Platform- and/or Interface-Specific Fixes or Features

6
src/invent.c
View File

@@ -1,4 +1,4 @@
/* NetHack 3.6 invent.c $NHDT-Date: 1555196229 2019/04/13 22:57:09 $ $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.253 $ */
/* NetHack 3.6 invent.c $NHDT-Date: 1558234540 2019/05/19 02:55:40 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.258 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/*-Copyright (c) Derek S. Ray, 2015. */
/* NetHack may be freely redistributed. See license for details. */
@@ -3581,7 +3581,8 @@ register struct obj *otmp, *obj;
if (obj->oclass == COIN_CLASS)
return TRUE;
if (obj->bypass != otmp->bypass)
if (obj->bypass != otmp->bypass
|| obj->cursed != otmp->cursed || obj->blessed != otmp->blessed)
return FALSE;
if (obj->globby)
@@ -3591,7 +3592,6 @@ register struct obj *otmp, *obj;
*/
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;