From 52f1c8a0d17bb615fe3aae101fe92ae981cc837b Mon Sep 17 00:00:00 2001 From: Blue Date: Wed, 8 Apr 2020 07:20:13 -0700 Subject: [PATCH] Added $OPTVAL_MBFSTRICT to menudef.txt, and added corresponding case 7 to the compatmode cvar in d_main.cpp --- src/d_main.cpp | 7 ++++++- wadsrc/static/menudef.txt | 1 + 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/d_main.cpp b/src/d_main.cpp index c34541193..98042bcd8 100644 --- a/src/d_main.cpp +++ b/src/d_main.cpp @@ -1,5 +1,4 @@ //----------------------------------------------------------------------------- -// // Copyright 1993-1996 id Software // Copyright 1999-2016 Randy Heit // Copyright 2002-2016 Christoph Oelckers @@ -672,6 +671,12 @@ CUSTOM_CVAR(Int, compatmode, 0, CVAR_ARCHIVE|CVAR_NOINITCALL) w = COMPATF2_POINTONLINE | COMPATF2_EXPLODE2; break; + case 7: // Stricter MBF compatibility + v = COMPATF_CORPSEGIBS | COMPATF_NOBLOCKFRIENDS | COMPATF_MBFMONSTERMOVE | COMPATF_INVISIBILITY | + COMPATF_NOTOSSDROPS | COMPATF_MUSHROOM | COMPATF_NO_PASSMOBJ | COMPATF_BOOMSCROLL | COMPATF_WALLRUN | + COMPATF_TRACE | COMPATF_HITSCAN | COMPATF_MISSILECLIP | COMPATF_MASKEDMIDTEX | COMPATF_SOUNDTARGET; + w = COMPATF2_POINTONLINE | COMPATF2_EXPLODE1 | COMPATF2_EXPLODE2; + break; } compatflags = v; compatflags2 = w; diff --git a/wadsrc/static/menudef.txt b/wadsrc/static/menudef.txt index bc50d9500..b59af595f 100644 --- a/wadsrc/static/menudef.txt +++ b/wadsrc/static/menudef.txt @@ -1679,6 +1679,7 @@ OptionValue CompatModes 3, "$OPTVAL_BOOM" 6, "$OPTVAL_BOOMSTRICT" 5, "$OPTVAL_MBF" + 7, "$OPTVAL_MBFSTRICT" 4, "$OPTVAL_ZDOOM2063" }