zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-05-30 17:01:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'scriptable_cutscenes' into newrenderer

Browse source
This commit is contained in:
Christoph Oelckers 2021-05-02 22:37:46 +02:00
commit 8003ab6fa3
141 changed files with 10317 additions and 5320 deletions
Download patch file Download diff file Expand all files Collapse all files

6
source/games/sw/src/player.cpp
View file

@ -7041,9 +7041,7 @@ void MultiPlayLimits(void)
gNet.TimeLimitClock = gNet.TimeLimit;
MapRecord *next = nullptr;
// do not increment if level is 23 thru 28 (should be done smarter.)
if (currentLevel->levelNumber <= 22)
next = FindMapByLevelNum(currentLevel->levelNumber + 1);
next = FindNextMap(currentLevel);
ChangeLevel(next, -1);
}
}
@ -7203,7 +7201,7 @@ domovethings(void)
MapRecord *map = nullptr;
if (FinishAnim == ANIM_SUMO)
{
map = FindMapByLevelNum(currentLevel->levelNumber+1);
map = FindNextMap(currentLevel);
}
ChangeLevel(map, -1);
}