stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-11-15 09:11:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'udmf-more-linedef-types' into udmf-sector-fields

Browse source 
# Conflicts:
#	src/p_spec.c
This commit is contained in:
MascaraSnake 2021-12-31 14:14:23 +01:00
commit 0d2d7a2803
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
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;
@ -6961,7 +6961,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);