From c6946cc672640cdd4ea9f0c9b7b4c1d9a32e7f5a Mon Sep 17 00:00:00 2001
From: Rachael Alexanderson <eruanna@drdteam.org>
Date: Tue, 16 May 2017 01:57:37 -0400
Subject: [PATCH] - removed all instances of CF_POWERBUDDHA

---
 src/d_player.h        | 1 -
 src/p_interaction.cpp | 8 ++++++--
 src/p_lnspec.cpp      | 2 +-
 src/p_user.cpp        | 3 ++-
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/d_player.h b/src/d_player.h
index 509f089d9..7d8dbf380 100644
--- a/src/d_player.h
+++ b/src/d_player.h
@@ -211,7 +211,6 @@ typedef enum
 	CF_BUDDHA2			= 1 << 24,		// [MC] Absolute buddha. No voodoo can kill it either.
 	CF_GODMODE2			= 1 << 25,		// [MC] Absolute godmode. No voodoo can kill it either.
 	CF_BUDDHA			= 1 << 27,		// [SP] Buddha mode - take damage, but don't die
-	CF_POWERBUDDHA		= 1 << 28,		// [MC] Powerup version of Buddha to prevent interference with actual cheat.
 	CF_NOCLIP2			= 1 << 30,		// [RH] More Quake-like noclip
 } cheat_t;
 
diff --git a/src/p_interaction.cpp b/src/p_interaction.cpp
index 1ccae9a8c..7a6bb3ffa 100644
--- a/src/p_interaction.cpp
+++ b/src/p_interaction.cpp
@@ -1360,7 +1360,9 @@ static int DamageMobj (AActor *target, AActor *inflictor, AActor *source, int da
 			// but telefragging should still do enough damage to kill the player)
 			// Ignore players that are already dead.
 			// [MC]Buddha2 absorbs telefrag damage, and anything else thrown their way.
-			if (!(flags & DMG_FORCED) && (((player->cheats & CF_BUDDHA2) || (((player->cheats & CF_BUDDHA) || (player->mo->FindInventory (PClass::FindActor(NAME_PowerBuddha),true) != nullptr) || (player->mo->flags7 & MF7_BUDDHA)) && !telefragDamage)) && (player->playerstate != PST_DEAD)))
+			if (!(flags & DMG_FORCED) && (((player->cheats & CF_BUDDHA2) || (((player->cheats & CF_BUDDHA) ||
+				(player->mo->FindInventory (PClass::FindActor(NAME_PowerBuddha),true) != nullptr) ||
+				(player->mo->flags7 & MF7_BUDDHA)) && !telefragDamage)) && (player->playerstate != PST_DEAD)))
 			{
 				// If this is a voodoo doll we need to handle the real player as well.
 				player->mo->health = target->health = player->health = 1;
@@ -1896,7 +1898,9 @@ void P_PoisonDamage (player_t *player, AActor *source, int damage, bool playPain
 	target->health -= damage;
 	if (target->health <= 0)
 	{ // Death
-		if ((((player->cheats & CF_BUDDHA|CF_POWERBUDDHA) || (player->mo->flags7 & MF7_BUDDHA)) && damage < TELEFRAG_DAMAGE) || (player->cheats & CF_BUDDHA2))
+		if ((((player->cheats & CF_BUDDHA) ||
+			(player->mo->flags7 & MF7_BUDDHA)) && damage < TELEFRAG_DAMAGE) || (player->cheats & CF_BUDDHA2) ||
+			(player->mo->FindInventory (PClass::FindActor(NAME_PowerBuddha),true) != nullptr))
 		{ // [SP] Save the player... 
 			player->health = target->health = 1;
 		}
diff --git a/src/p_lnspec.cpp b/src/p_lnspec.cpp
index 368a8a776..001b39be8 100644
--- a/src/p_lnspec.cpp
+++ b/src/p_lnspec.cpp
@@ -2978,7 +2978,7 @@ FUNC(LS_SetPlayerProperty)
 	switch (arg2)
 	{
 	case PROP_BUDDHA:
-		mask = CF_POWERBUDDHA;
+		mask = CF_BUDDHA;
 		break;
 	case PROP_FROZEN:
 		mask = CF_FROZEN;
diff --git a/src/p_user.cpp b/src/p_user.cpp
index f01ea08ae..54a0acbaa 100644
--- a/src/p_user.cpp
+++ b/src/p_user.cpp
@@ -2156,7 +2156,8 @@ void P_FallingDamage (AActor *actor)
 	{
 		S_Sound (actor, CHAN_AUTO, "*land", 1, ATTN_NORM);
 		P_NoiseAlert (actor, actor, true);
-		if (damage >= TELEFRAG_DAMAGE && (actor->player->cheats & (CF_GODMODE | CF_BUDDHA | CF_POWERBUDDHA )))
+		if (damage >= TELEFRAG_DAMAGE && ((actor->player->cheats & (CF_GODMODE | CF_BUDDHA) ||
+			(actor->FindInventory(PClass::FindActor(NAME_PowerBuddha), true) != nullptr))))
 		{
 			damage = 999;
 		}