From 865575bb9952546d1baaffcc193c9a384ae43537 Mon Sep 17 00:00:00 2001
From: Anders Jenbo <anders@jenbo.dk>
Date: Fri, 10 Jan 2020 11:07:37 +0100
Subject: [PATCH] [hellfire] TryIconCurs && DoOil (#1941)

---
 Source/diablo.cpp |  9 +++++++++
 Source/items.cpp  | 21 +++++++++++++++++++++
 Source/items.h    |  4 ++++
 3 files changed, 34 insertions(+)

diff --git a/Source/diablo.cpp b/Source/diablo.cpp
index cc247d9cb..a0159bc01 100644
--- a/Source/diablo.cpp
+++ b/Source/diablo.cpp
@@ -927,6 +927,15 @@ BOOL TryIconCurs()
 			SetCursor_(CURSOR_HAND);
 		}
 		return TRUE;
+#ifdef HELLFIRE
+	} else if (pcurs == CURSOR_OIL) {
+		if (pcursinvitem != -1) {
+			DoOil(myplr, pcursinvitem);
+		} else {
+			SetCursor_(CURSOR_HAND);
+		}
+		return TRUE;
+#endif
 	} else if (pcurs == CURSOR_TELEPORT) {
 		if (pcursmonst != -1) {
 			NetSendCmdParam3(TRUE, CMD_TSPELLID, pcursmonst, plr[myplr]._pTSpell, GetSpellLevel(myplr, plr[myplr]._pTSpell));
diff --git a/Source/items.cpp b/Source/items.cpp
index 33a3517e5..7f9dd55d6 100644
--- a/Source/items.cpp
+++ b/Source/items.cpp
@@ -3198,6 +3198,27 @@ void DoRecharge(int pnum, int cii)
 		SetCursor_(CURSOR_HAND);
 }
 
+#ifdef HELLFIRE
+void DoOil(int pnum, int cii)
+{
+	PlayerStruct *p = &plr[pnum];
+
+	if (cii >= NUM_INVLOC || cii == INVLOC_HEAD || (cii > INVLOC_AMULET && cii <= INVLOC_CHEST)) {
+		if (OilItem(&p->InvBody[cii], p)) {
+			CalcPlrInv(pnum, TRUE);
+			if (pnum == myplr) {
+				SetCursor_(CURSOR_HAND);
+			}
+		}
+	}
+}
+
+BOOL OilItem(ItemStruct *x, PlayerStruct *p)
+{
+	return FALSE;
+}
+
+#endif
 void RechargeItem(ItemStruct *i, int r)
 {
 	while (i->_iCharges != i->_iMaxCharges) {
diff --git a/Source/items.h b/Source/items.h
index a2d76f610..4c900a06a 100644
--- a/Source/items.h
+++ b/Source/items.h
@@ -115,6 +115,10 @@ void CheckIdentify(int pnum, int cii);
 void DoRepair(int pnum, int cii);
 void RepairItem(ItemStruct *i, int lvl);
 void DoRecharge(int pnum, int cii);
+#ifdef HELLFIRE
+void DoOil(int pnum, int cii);
+BOOL OilItem(ItemStruct *x, PlayerStruct *p);
+#endif
 void RechargeItem(ItemStruct *i, int r);
 void PrintItemOil(char IDidx);
 void PrintItemPower(char plidx, ItemStruct *x);