mirror of
https://git.do.srb2.org/KartKrew/Kart-Public.git
synced 2024-12-28 05:11:34 +00:00
Merge branch 'fix_each_time' into next
Conflicts: src/p_floor.c
This commit is contained in:
commit
15f0670c43
1 changed files with 3 additions and 1 deletions
|
@ -2217,7 +2217,7 @@ void T_EachTimeThinker(levelspecthink_t *eachtime)
|
|||
oldPlayersArea = oldPlayersInArea;
|
||||
}
|
||||
|
||||
if ((affectPlayer = P_HavePlayersEnteredArea(playersArea, oldPlayersArea, inAndOut)) != -1)
|
||||
while ((affectPlayer = P_HavePlayersEnteredArea(playersArea, oldPlayersArea, inAndOut)) != -1)
|
||||
{
|
||||
if (GETSECSPECIAL(sec->special, 2) == 2 || GETSECSPECIAL(sec->special, 2) == 3)
|
||||
{
|
||||
|
@ -2250,6 +2250,8 @@ void T_EachTimeThinker(levelspecthink_t *eachtime)
|
|||
|
||||
if (!eachtime->sourceline->special) // this happens only for "Trigger on X calls" linedefs
|
||||
P_RemoveThinker(&eachtime->thinker);
|
||||
|
||||
oldPlayersArea[affectPlayer]=playersArea[affectPlayer];
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue