From a5ca521f0d96921d431e17666b3e07944f0673e0 Mon Sep 17 00:00:00 2001
From: Anders Jenbo <anders@jenbo.dk>
Date: Mon, 22 Feb 2021 00:12:23 +0100
Subject: [PATCH] Fix item morphing in Hellfire

---
 Source/loadsave.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Source/loadsave.cpp b/Source/loadsave.cpp
index 317772877..bfe2e1e8c 100644
--- a/Source/loadsave.cpp
+++ b/Source/loadsave.cpp
@@ -940,7 +940,7 @@ void LoadGame(BOOL firstflag)
 	SetCursor_(CURSOR_HAND);
 	gbProcessPlayers = TRUE;
 
-    gbIsHellfireSaveGame = gbIsHellfire;
+	gbIsHellfireSaveGame = gbIsHellfire;
 }
 
 static void BSave(char v)
@@ -982,7 +982,9 @@ static void SaveBool32(bool value)
 
 static void SaveItem(ItemStruct *pItem)
 {
-	int idx = RemapItemIdxToDiablo(pItem->IDidx);
+	int idx = pItem->IDidx;
+	if (!gbIsHellfire)
+		idx = RemapItemIdxToDiablo(idx);
 	int iType = pItem->_itype;
 	if (idx == -1) {
 		idx = 0;