- added a map flag to disable MF6_JUMPDOWN.

Not really useful but since MBF has this we may need it if we support the OPTIONS lump for MBF21 later.
This is intentionally not exposed to MAPINFO.
This commit is contained in:
Christoph Oelckers 2021-08-21 11:37:57 +02:00
parent ff497996a3
commit b1de11dce8
2 changed files with 2 additions and 1 deletions

View file

@ -259,6 +259,7 @@ enum ELevelFlags : unsigned int
LEVEL3_E4M6SPECIAL = 0x00008000, LEVEL3_E4M6SPECIAL = 0x00008000,
LEVEL3_NOSHADOWMAP = 0x00010000, // disables shadowmaps for a given level. LEVEL3_NOSHADOWMAP = 0x00010000, // disables shadowmaps for a given level.
LEVEL3_AVOIDMELEE = 0x00020000, // global flag needed for proper MBF support. LEVEL3_AVOIDMELEE = 0x00020000, // global flag needed for proper MBF support.
LEVEL3_NOJUMPDOWN = 0x00040000, // only for MBF21. Inverse of MBF's dog_jumping flag.
}; };

View file

@ -456,7 +456,7 @@ int P_Move (AActor *actor)
// and only if the target is immediately on the other side of the line. // and only if the target is immediately on the other side of the line.
AActor *target = actor->target; AActor *target = actor->target;
if ((actor->flags6 & MF6_JUMPDOWN) && target && if ((actor->flags6 & MF6_JUMPDOWN) && target && !(actor->Level->flags3 & LEVEL3_NOJUMPDOWN) &&
!(target->IsFriend(actor)) && !(target->IsFriend(actor)) &&
actor->Distance2D(target) < 144 && actor->Distance2D(target) < 144 &&
pr_dropoff() < 235) pr_dropoff() < 235)