From 625fc73f288b26191a178d1575954a46f28bc191 Mon Sep 17 00:00:00 2001 From: Rachael Alexanderson Date: Tue, 16 May 2017 04:10:46 -0400 Subject: [PATCH] - Missed a few CF_POWERBUDDHA references. --- wadsrc/static/zscript/constants.txt | 1 - wadsrc/static/zscript/inventory/powerups.txt | 20 -------------------- 2 files changed, 21 deletions(-) diff --git a/wadsrc/static/zscript/constants.txt b/wadsrc/static/zscript/constants.txt index 2d2be8ff7..5477d24ee 100644 --- a/wadsrc/static/zscript/constants.txt +++ b/wadsrc/static/zscript/constants.txt @@ -1114,7 +1114,6 @@ enum EPlayerCheats 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 // These flags no longer exist, but keep the names for some stray mod that might have used them. diff --git a/wadsrc/static/zscript/inventory/powerups.txt b/wadsrc/static/zscript/inventory/powerups.txt index cf0dc2106..055fd518f 100644 --- a/wadsrc/static/zscript/inventory/powerups.txt +++ b/wadsrc/static/zscript/inventory/powerups.txt @@ -1450,26 +1450,6 @@ class PowerBuddha : Powerup { Powerup.Duration -60; } - - override void InitEffect () - { - Super.InitEffect(); - - if (Owner== null || Owner.player == null) - return; - - Owner.player.cheats |= CF_POWERBUDDHA; - } - - override void EndEffect () - { - Super.EndEffect(); - - if (Owner== null || Owner.player == null) - return; - - Owner.player.cheats &= ~CF_POWERBUDDHA; - } } //===========================================================================