From 96ff78e9e0881fee081d21a1d38c6e69711a9dfc Mon Sep 17 00:00:00 2001 From: qndel Date: Sun, 15 Sep 2019 03:33:25 +0200 Subject: [PATCH] [hellfire] WitchItemOk bin exact --- Source/items.cpp | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/Source/items.cpp b/Source/items.cpp index cbec8f07d..b1f4bec8d 100644 --- a/Source/items.cpp +++ b/Source/items.cpp @@ -3701,6 +3701,20 @@ BOOL WitchItemOk(int i) BOOL rv; rv = FALSE; +#ifdef HELLFIRE + if (AllItemsList[i].itype == ITYPE_MISC || AllItemsList[i].itype == ITYPE_STAFF) + rv = TRUE; + if (AllItemsList[i].iMiscId == IMISC_MANA || AllItemsList[i].iMiscId == IMISC_FULLMANA) + rv = FALSE; + if (AllItemsList[i].iSpell == SPL_TOWN) + rv = FALSE; + if (AllItemsList[i].iMiscId == IMISC_FULLHEAL || AllItemsList[i].iMiscId == IMISC_HEAL) + rv = FALSE; + if (AllItemsList[i].iMiscId > IMISC_OILFIRST && AllItemsList[i].iMiscId < IMISC_OILLAST) + rv = FALSE; + if ((AllItemsList[i].iSpell == SPL_RESURRECT && gbMaxPlayers == 1) || (AllItemsList[i].iSpell == SPL_HEALOTHER && gbMaxPlayers == 1)) + rv = FALSE; +#else if (AllItemsList[i].itype == ITYPE_MISC) rv = TRUE; if (AllItemsList[i].itype == ITYPE_STAFF) @@ -3719,6 +3733,7 @@ BOOL WitchItemOk(int i) rv = FALSE; if (AllItemsList[i].iSpell == SPL_HEALOTHER && gbMaxPlayers == 1) rv = FALSE; +#endif return rv; }