zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-10 23:02:08 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fix arti teleport and arti teleother not respecting useplayerstartz mapflag

Browse source
This commit is contained in:
Rachael Alexanderson 2022-08-26 04:09:54 -04:00
parent 8c0ad50db3
commit 8468f712e0
4 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/scripting/vmthunks.cpp
View file

@ -2732,6 +2732,7 @@ DEFINE_FIELD_BIT(FLevelLocals, flags, noinventorybar, LEVEL_NOINVENTORYBAR)
DEFINE_FIELD_BIT(FLevelLocals, flags, monsterstelefrag, LEVEL_MONSTERSTELEFRAG)
DEFINE_FIELD_BIT(FLevelLocals, flags, actownspecial, LEVEL_ACTOWNSPECIAL)
DEFINE_FIELD_BIT(FLevelLocals, flags, sndseqtotalctrl, LEVEL_SNDSEQTOTALCTRL)
DEFINE_FIELD_BIT(FLevelLocals, flags, useplayerstartz, LEVEL_USEPLAYERSTARTZ)
DEFINE_FIELD_BIT(FLevelLocals, flags2, allmap, LEVEL2_ALLMAP)
DEFINE_FIELD_BIT(FLevelLocals, flags2, missilesactivateimpact, LEVEL2_MISSILESACTIVATEIMPACT)
DEFINE_FIELD_BIT(FLevelLocals, flags2, monsterfallingdamage, LEVEL2_MONSTERFALLINGDAMAGE)

5
wadsrc/static/zscript/actors/hexen/teleportother.zs
View file

@ -163,8 +163,9 @@ class TelOtherFX1 : Actor
double destAngle;
[dest, destAngle] = level.PickPlayerStart(0, PPS_FORCERANDOM | PPS_NOBLOCKINGCHECK);
dest.Z = ONFLOORZ;
victim.Teleport ((dest.xy, ONFLOORZ), destangle, TELF_SOURCEFOG | TELF_DESTFOG);
if (!level.useplayerstartz)
dest.Z = ONFLOORZ;
victim.Teleport (dest, destangle, TELF_SOURCEFOG | TELF_DESTFOG);
}
//===========================================================================

3
wadsrc/static/zscript/actors/raven/artitele.zs
View file

@ -36,7 +36,8 @@ class ArtiTeleport : Inventory
{
[dest, destAngle] = level.PickPlayerStart(Owner.PlayerNumber());
}
dest.Z = ONFLOORZ;
if (!level.useplayerstartz)
dest.Z = ONFLOORZ;
Owner.Teleport (dest, destAngle, TELF_SOURCEFOG | TELF_DESTFOG);
bool canlaugh = true;
Playerinfo p = Owner.player;

1
wadsrc/static/zscript/doombase.zs
View file

@ -437,6 +437,7 @@ struct LevelLocals native
native readonly bool no_dlg_freeze;
native readonly bool keepfullinventory;
native readonly bool removeitems;
native readonly bool useplayerstartz;
native readonly int fogdensity;
native readonly int outsidefogdensity;
native readonly int skyfog;