Merge branch 'NetHack-3.6'

This commit is contained in:
nhmall
2019-05-17 12:06:58 -04:00
7 changed files with 195 additions and 15 deletions

View File

@@ -715,7 +715,8 @@ struct obj **potmp, **pobj;
otmp->age = ((otmp->age * otmp->quan) + (obj->age * obj->quan))
/ (otmp->quan + obj->quan);
otmp->quan += obj->quan;
if (!otmp->globby)
otmp->quan += obj->quan;
/* temporary special case for gold objects!!!! */
if (otmp->oclass == COIN_CLASS)
otmp->owt = weight(otmp), otmp->bknown = 0;