From 868b3244bb0dbb4b18b2e51fdeb4548a6bd3bcda Mon Sep 17 00:00:00 2001 From: Anders Jenbo Date: Tue, 9 Apr 2019 22:12:25 +0200 Subject: [PATCH] Clean up SetGoldCurs & SetSpdbarGoldCurs --- Source/stores.cpp | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/Source/stores.cpp b/Source/stores.cpp index d1f03f6fb..93967423f 100644 --- a/Source/stores.cpp +++ b/Source/stores.cpp @@ -2238,26 +2238,22 @@ void S_SmithEnter() void SetGoldCurs(int pnum, int i) { - if (plr[pnum].InvList[i]._ivalue < 2500) { - if (plr[pnum].InvList[i]._ivalue > 1000) - plr[pnum].InvList[i]._iCurs = ICURS_GOLD_MEDIUM; - else - plr[pnum].InvList[i]._iCurs = ICURS_GOLD_SMALL; - } else { + if (plr[pnum].InvList[i]._ivalue >= 2500) plr[pnum].InvList[i]._iCurs = ICURS_GOLD_LARGE; - } + else if (plr[pnum].InvList[i]._ivalue <= 1000) + plr[pnum].InvList[i]._iCurs = ICURS_GOLD_SMALL; + else + plr[pnum].InvList[i]._iCurs = ICURS_GOLD_MEDIUM; } void SetSpdbarGoldCurs(int pnum, int i) { - if (plr[pnum].SpdList[i]._ivalue < 2500) { - if (plr[pnum].SpdList[i]._ivalue > 1000) - plr[pnum].SpdList[i]._iCurs = ICURS_GOLD_MEDIUM; - else - plr[pnum].SpdList[i]._iCurs = ICURS_GOLD_SMALL; - } else { + if (plr[pnum].SpdList[i]._ivalue >= 2500) plr[pnum].SpdList[i]._iCurs = ICURS_GOLD_LARGE; - } + else if (plr[pnum].SpdList[i]._ivalue <= 1000) + plr[pnum].SpdList[i]._iCurs = ICURS_GOLD_SMALL; + else + plr[pnum].SpdList[i]._iCurs = ICURS_GOLD_MEDIUM; } void TakePlrsMoney(int cost)