OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- make stuff compile again

Browse source
This commit is contained in:
Christoph Oelckers 2022-04-22 11:27:49 +02:00
commit 54329bd87b
5 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/intermission/intermission_parse.cpp
View file

@ -42,6 +42,7 @@
#include "gstrings.h"
#include "gi.h"
#include "screenjob.h"
#include "d_event.h"
static void ReplaceIntermission(FName intname,FIntermissionDescriptor *desc)
@ -910,14 +911,14 @@ DIntermissionController* F_StartFinale (const char *music, int musicorder, int c
desc->mActions.Push(wiper);
}
return F_StartIntermission(desc, true, ending? FSTATE_EndingGame : FSTATE_ChangingLevel);
return F_StartIntermission(desc, true);
}
else if (ending)
{
FIntermissionDescriptor **pdesc = IntermissionDescriptors.CheckKey(endsequence);
if (pdesc != NULL)
{
return F_StartIntermission(*pdesc, false, ending? FSTATE_EndingGame : FSTATE_ChangingLevel);
return F_StartIntermission(*pdesc, false);
}
}
return nullptr;