OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge branch 'master' into texture_rework

Browse source
This commit is contained in:
Christoph Oelckers 2020-04-19 18:07:16 +02:00
commit 0eb68177ca
13 changed files with 41 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/playsim/p_3dfloors.cpp
View file

@ -217,10 +217,11 @@ void P_PlayerOnSpecial3DFloor(player_t* player)
// Player must be on top of the floor to be affected...
if(player->mo->Z() != rover->top.plane->ZatPoint(player->mo)) continue;
}
else
else
{
//Water and DEATH FOG!!! heh
if (player->mo->Z() > rover->top.plane->ZatPoint(player->mo) ||
if ((rover->flags & FF_NODAMAGE) ||
player->mo->Z() > rover->top.plane->ZatPoint(player->mo) ||
player->mo->Top() < rover->bottom.plane->ZatPoint(player->mo))
continue;
}

2
src/playsim/p_3dfloors.h
View file

@ -23,7 +23,7 @@ typedef enum
FF_UPPERTEXTURE = 0x20000,
FF_LOWERTEXTURE = 0x40000,
FF_THINFLOOR = 0x80000, // EDGE
FF_SCROLLY = 0x100000, // EDGE - not yet implemented!!!
FF_NODAMAGE = 0x100000, // no damage transfers
FF_FIX = 0x200000, // use floor of model sector as floor and floor of real sector as ceiling
FF_INVERTSECTOR = 0x400000, // swap meaning of sector planes
FF_DYNAMIC = 0x800000, // created by partitioning another 3D-floor due to overlap

7
src/playsim/p_lnspec.cpp
View file

@ -3911,6 +3911,13 @@ int P_FindLineSpecial (const char *string, int *min_args, int *max_args)
max = mid - 1;
}
}
// Alias for ZScript. Check here to have universal support everywhere.
if (!stricmp(string, "TeleportSpecial"))
{
if (min_args != NULL) *min_args = 1;
if (max_args != NULL) *max_args = 3;
return Teleport;
}
return 0;
}