From 331a540fc32599894ff736d872a3f21ec5fa7d9d Mon Sep 17 00:00:00 2001 From: Anders Jenbo Date: Mon, 29 Mar 2021 02:22:07 +0200 Subject: [PATCH] :fire: Remove the auricGold variable --- Source/items.cpp | 3 +-- Source/items.h | 1 - Source/player.cpp | 5 ++++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Source/items.cpp b/Source/items.cpp index 2ef262fd6..1781358eb 100644 --- a/Source/items.cpp +++ b/Source/items.cpp @@ -20,7 +20,6 @@ BOOL itemhold[3][3]; CornerStoneStruct CornerStone; BYTE *itemanims[ITEMTYPES]; BOOL UniqueItemFlag[128]; -int auricGold = (GOLD_MAX_LIMIT * 2); int numitems; int gnNumGetRecords; @@ -1078,7 +1077,7 @@ void CalcPlrItemVals(int p, BOOL Loadgfx) if (half != MaxGold) StripTopGold(p); } else { - MaxGold = auricGold; + MaxGold = GOLD_MAX_LIMIT * 2; } drawmanaflag = TRUE; diff --git a/Source/items.h b/Source/items.h index cc21bd0fd..686dd7767 100644 --- a/Source/items.h +++ b/Source/items.h @@ -260,7 +260,6 @@ extern int itemavail[MAXITEMS]; extern ItemStruct item[MAXITEMS + 1]; extern CornerStoneStruct CornerStone; extern BOOL UniqueItemFlag[128]; -extern int auricGold; extern int numitems; bool IsItemAvailable(int i); diff --git a/Source/player.cpp b/Source/player.cpp index f5389dce0..1a2a89776 100644 --- a/Source/player.cpp +++ b/Source/player.cpp @@ -3415,7 +3415,10 @@ void ValidatePlayer() gt = 0; for (i = 0; i < plr[myplr]._pNumInv; i++) { if (plr[myplr].InvList[i]._itype == ITYPE_GOLD) { - int maxGold = gbIsHellfire ? auricGold : GOLD_MAX_LIMIT; + int maxGold = GOLD_MAX_LIMIT; + if (gbIsHellfire) { + maxGold *= 2; + } if (plr[myplr].InvList[i]._ivalue > maxGold) { plr[myplr].InvList[i]._ivalue = maxGold; }