stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-02-01 22:21:05 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'udmf-executor-triggers' into udmf-thing-types

Browse source
This commit is contained in:
MascaraSnake 2021-12-31 14:11:50 +01:00
commit 98157daa1c
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/p_spec.c
View file

@ -2719,7 +2719,7 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
// Reset bot too. // Reset bot too.
if (bot) { if (bot) {
if (line->flags & ML_NOCLIMB) if (line->args[0])
P_TeleportMove(bot, mo->x, mo->y, mo->z); P_TeleportMove(bot, mo->x, mo->y, mo->z);
bot->momx = bot->momy = bot->momz = 1; bot->momx = bot->momy = bot->momz = 1;
bot->pmomz = 0; bot->pmomz = 0;
@ -4051,7 +4051,7 @@ sector_t *P_MobjTouchingSectorSpecial(mobj_t *mo, INT32 section, INT32 number)
if (!(node->m_sector->flags & SF_TRIGGERSPECIAL_TOUCH)) if (!(node->m_sector->flags & SF_TRIGGERSPECIAL_TOUCH))
continue; continue;
if (GETSECSPECIAL(mo->subsector->sector->special, section) == number) if (GETSECSPECIAL(node->m_sector->special, section) == number)
return node->m_sector; return node->m_sector;
} }
@ -6800,7 +6800,7 @@ void P_SpawnSpecials(boolean fromnetsave)
case 604: // Adjustable Blinking Light case 604: // Adjustable Blinking Light
sec = sides[*lines[i].sidenum].sector - sectors; sec = sides[*lines[i].sidenum].sector - sectors;
TAG_ITER_SECTORS(tag, s) TAG_ITER_SECTORS(lines[i].args[0], s)
P_SpawnAdjustableStrobeFlash(&sectors[s], lines[i].args[3], P_SpawnAdjustableStrobeFlash(&sectors[s], lines[i].args[3],
(lines[i].args[4] & TMB_USETARGET) ? sectors[s].lightlevel : lines[i].args[5], (lines[i].args[4] & TMB_USETARGET) ? sectors[s].lightlevel : lines[i].args[5],
lines[i].args[1], lines[i].args[2], lines[i].args[4] & TMB_SYNC); lines[i].args[1], lines[i].args[2], lines[i].args[4] & TMB_SYNC);