fix some billing and pricing issues when globs coalesce

payment issue caused by glob coalescing
glob pricing did not consider coalesced weight
This commit is contained in:
nhmall
2019-05-17 12:04:01 -04:00
parent 53f208c48b
commit 2aee73642d
6 changed files with 181 additions and 11 deletions

View File

@@ -720,7 +720,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;