diff --git a/wadsrc/static/zscript/actors/doom/fatso.zs b/wadsrc/static/zscript/actors/doom/fatso.zs index 98d6ab585..763958da1 100644 --- a/wadsrc/static/zscript/actors/doom/fatso.zs +++ b/wadsrc/static/zscript/actors/doom/fatso.zs @@ -195,7 +195,7 @@ extend class Actor aimtarget.Height = Height; bool shootmode = ((flags & MSF_Classic) || // Flag explicitly set, or no flags and compat options - (flags == 0 && CurState.bDehacked && (Level.compatflags & COMPATF_MUSHROOM))); + (flags == 0 && CurState.bDehacked && (compatflags & COMPATF_MUSHROOM))); for (i = -numspawns; i <= numspawns; i += 8) { diff --git a/wadsrc/static/zscript/actors/doom/painelemental.zs b/wadsrc/static/zscript/actors/doom/painelemental.zs index 244261303..d374cf843 100644 --- a/wadsrc/static/zscript/actors/doom/painelemental.zs +++ b/wadsrc/static/zscript/actors/doom/painelemental.zs @@ -86,7 +86,7 @@ extend class Actor } // [RH] make this optional - if (limit < 0 && (Level.compatflags & COMPATF_LIMITPAIN)) + if (limit < 0 && (compatflags & COMPATF_LIMITPAIN)) limit = 21; if (limit > 0) diff --git a/wadsrc/static/zscript/actors/inventory_util.zs b/wadsrc/static/zscript/actors/inventory_util.zs index 6b65b6420..3df53bf69 100644 --- a/wadsrc/static/zscript/actors/inventory_util.zs +++ b/wadsrc/static/zscript/actors/inventory_util.zs @@ -634,7 +634,7 @@ extend class Actor Actor mo; double spawnz = 0; - if (!(Level.compatflags & COMPATF_NOTOSSDROPS)) + if (!(compatflags & COMPATF_NOTOSSDROPS)) { int style = sv_dropstyle; if (style == 0) @@ -655,7 +655,7 @@ extend class Actor { mo.bDropped = true; mo.bNoGravity = false; // [RH] Make sure it is affected by gravity - if (!(Level.compatflags & COMPATF_NOTOSSDROPS)) + if (!(compatflags & COMPATF_NOTOSSDROPS)) { mo.TossItem (); } diff --git a/wadsrc/static/zscript/actors/player/player.zs b/wadsrc/static/zscript/actors/player/player.zs index 48a5cdff6..892550ed2 100644 --- a/wadsrc/static/zscript/actors/player/player.zs +++ b/wadsrc/static/zscript/actors/player/player.zs @@ -1944,7 +1944,7 @@ class PlayerPawn : Actor override int GetMaxHealth(bool withupgrades) const { - int ret = MaxHealth > 0? MaxHealth : ((Level.compatflags & COMPATF_DEHHEALTH)? 100 : deh.MaxHealth); + int ret = MaxHealth > 0? MaxHealth : ((compatflags & COMPATF_DEHHEALTH)? 100 : deh.MaxHealth); if (withupgrades) ret += stamina + BonusHealth; return ret; } diff --git a/wadsrc/static/zscript/actors/raven/minotaur.zs b/wadsrc/static/zscript/actors/raven/minotaur.zs index b3e71013c..4bdcd1eb0 100644 --- a/wadsrc/static/zscript/actors/raven/minotaur.zs +++ b/wadsrc/static/zscript/actors/raven/minotaur.zs @@ -347,7 +347,7 @@ class Minotaur : Actor } else { - if (Floorclip > 0 && (Level.compatflags & COMPAT_MINOTAUR)) + if (Floorclip > 0 && (compatflags & COMPAT_MINOTAUR)) { // only play the sound. A_StartSound ("minotaur/fx2hit", CHAN_WEAPON);