Cleaned up Dilapidated Tome calculation again

SoundChaser83 · May 14, 2022 · d5fb47a · d5fb47a
1 parent 5b4f504
commit d5fb47a
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 13 deletions.
diff --git a/Source/items.cpp b/Source/items.cpp
@@ -2809,7 +2809,7 @@ void CalcPlrItemVals(Player &player, bool loadgfx)
 	player._pMaxMana = imana + player._pMaxManaBase;
 	player._pMana = std::min(imana + player._pManaBase, player._pMaxMana);
 
-	int hpToMagic = player.GetHPtoMagic();
+	int hpToMagic = std::max(((player._pMaxHP >> 6) - (player._pMaxMana >> 6)) / 2, 0);
 	if (player.tookDilapShrine) {
 		player._pMagic += hpToMagic;
 

diff --git a/Source/player.h b/Source/player.h
@@ -413,18 +413,6 @@ struct Player {
 	 */
 	void Reset();
 
-	/**
-	 * @brief Used to calculate the HP to magic conversion for Dilapated Tome
-	 */
-	int GetHPtoMagic() const
-	{
-		int hpToMagic = ((_pMaxHP >> 6) - (_pMaxMana >> 6)) / 2;
-		if (hpToMagic < 0)
-			hpToMagic = 0;
-
-		return hpToMagic;
-	}
-
 	/**
 	 * @brief Return player's armor value
 	 */