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

fix B10003 - GOLDOBJ: BUC gold; identification

Browse Source 
Curse and bless status has no meaning for gold.  Likewise
for erosion and other object flags controlling whether an item is
considered to be fully identified.
This commit is contained in:
nethack.rankin
2002-09-24 03:20:22 +00:00
parent b0f2478b51
commit 4d251c6688
5 changed files with 36 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/invent.c
View File

@@ -2228,16 +2228,12 @@ STATIC_OVL boolean
mergable(otmp, obj) /* returns TRUE if obj & otmp can be merged */
register struct obj *otmp, *obj;
{
#ifndef GOLDOBJ
if (obj->otyp != otmp->otyp || obj->unpaid != otmp->unpaid ||
#else
if (obj->otyp != otmp->otyp) return FALSE;
/* Coins of the same kind will always merge. */
if (obj->oclass == COIN_CLASS) return TRUE;
if (obj->unpaid != otmp->unpaid ||
#ifdef GOLDOBJ
/* coins of the same kind will always merge */
if (obj->oclass == COIN_CLASS) return TRUE;
#endif
if (obj->unpaid != otmp->unpaid ||
obj->spe != otmp->spe || obj->dknown != otmp->dknown ||
(obj->bknown != otmp->bknown && !Role_if(PM_PRIEST)) ||
obj->cursed != otmp->cursed || obj->blessed != otmp->blessed ||