From 2583da968018947be7eeb09bbb7ebe7ed143d756 Mon Sep 17 00:00:00 2001 From: Major Cooke Date: Sun, 6 Nov 2016 07:44:30 -0600 Subject: [PATCH] Do not allow DMG_FORCED to bypass ultimate degreeslessness/buddha for players. --- src/p_interaction.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/p_interaction.cpp b/src/p_interaction.cpp index b4ecc827eb..48d13bebff 100644 --- a/src/p_interaction.cpp +++ b/src/p_interaction.cpp @@ -1242,6 +1242,11 @@ int P_DamageMobj (AActor *target, AActor *inflictor, AActor *source, int damage, // if (player) { + // Don't allow DMG_FORCED to work on ultimate degreeslessness/buddha and nodamage. + if ((player->cheats & (CF_GODMODE2 | CF_BUDDHA2)) || (player->mo->flags5 & MF5_NODAMAGE)) + { + flags &= ~DMG_FORCED; + } //Added by MC: Lets bots look allround for enemies if they survive an ambush. if (player->Bot != NULL) {