diff --git a/Source/spells.cpp b/Source/spells.cpp
index 8bd5d983e..aea7f5d16 100644
--- a/Source/spells.cpp
+++ b/Source/spells.cpp
@@ -171,17 +171,21 @@ void DoResurrect(int pnum, int rid)
 		ClrPlrPath(rid);
 		plr[rid].destAction = ACTION_NONE;
 		plr[rid]._pInvincible = FALSE;
+#ifndef HELLFIRE
 		PlacePlayer(rid);
+#endif
 
 		hp = 640;
+#ifndef HELLFIRE
 		if (plr[rid]._pMaxHPBase < 640) {
 			hp = plr[rid]._pMaxHPBase;
 		}
+#endif
 		SetPlayerHitPoints(rid, hp);
 
-		plr[rid]._pMana = 0;
 		plr[rid]._pHPBase = plr[rid]._pHitPoints + (plr[rid]._pMaxHPBase - plr[rid]._pMaxHP);
-		plr[rid]._pManaBase = plr[rid]._pMaxManaBase - plr[rid]._pMaxMana;
+		plr[rid]._pMana = 0;
+		plr[rid]._pManaBase = plr[rid]._pMana + (plr[rid]._pMaxManaBase - plr[rid]._pMaxMana);
 
 		CalcPlrInv(rid, TRUE);