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

- fixing some issues. Level transitions in Duke are working now.

Browse source
This commit is contained in:
Christoph Oelckers 2020-09-04 00:20:32 +02:00
parent e5e8c02f1d
commit 77f96a1c75
5 changed files with 17 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

15
source/core/mainloop.cpp
View file

@ -139,7 +139,9 @@ static void GameTicker()
g_nextskill = -1;
FX_StopAllSounds();
FX_SetReverb(0);
gi->NextLevel(currentLevel, -1);
gi->FreeLevelData();
gamestate = GS_LEVEL;
gi->NextLevel(g_nextmap, -1);
break;
case ga_completed:
@ -149,7 +151,8 @@ static void GameTicker()
{
// if the same level is restarted, skip any progression stuff like summary screens or cutscenes.
gi->FreeLevelData();
gi->NextLevel(currentLevel, g_nextskill);
gamestate = GS_LEVEL;
gi->NextLevel(g_nextmap, g_nextskill);
}
else
gi->LevelCompleted(g_nextmap, g_nextskill);
@ -157,13 +160,15 @@ static void GameTicker()
case ga_nextlevel:
gi->FreeLevelData();
gi->NextLevel(currentLevel, g_nextskill);
gamestate = GS_LEVEL;
gi->NextLevel(g_nextmap, g_nextskill);
break;
case ga_newgame:
FX_StopAllSounds();
FX_SetReverb(0);
gi->FreeLevelData();
gamestate = GS_LEVEL;
gi->NewGame(g_nextmap, g_nextskill);
break;
@ -289,6 +294,7 @@ void Display()
switch (gamestate)
{
case GS_MENUSCREEN:
case GS_FULLCONSOLE:
gi->DrawBackground();
break;
@ -314,6 +320,7 @@ void Display()
break;
default:
twod->ClearScreen();
break;
}
@ -392,7 +399,7 @@ void TryRunTics (void)
bool doWait = cl_capfps || pauseext || (r_NoInterpolate && !M_IsAnimated());
// get real tics
if (doWait && gamestate != GS_INTERMISSION) // GS_INTERMISSION needs uncapped frame rate.
if (doWait && gamestate != GS_INTERMISSION && gamestate != GS_INTRO) // GS_INTERMISSION needs uncapped frame rate.
{
entertic = I_WaitForTic (oldentertics);
}