OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- properly deal with 'gototitle'.

Browse source
This commit is contained in:
Christoph Oelckers 2022-04-23 18:52:50 +02:00
commit 7b59293995
3 changed files with 20 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/intermission/intermission.cpp
View file

@ -872,9 +872,7 @@ again:
}
else if (action->mClass == TITLE_ID)
{
Destroy();
D_StartTitle ();
return false;
continue;
}
else
{
@ -1011,13 +1009,21 @@ DIntermissionController* F_StartIntermission(FIntermissionDescriptor *desc, bool
DIntermissionController* F_StartIntermission(FName seq)
{
FIntermissionDescriptor **pdesc = IntermissionDescriptors.CheckKey(seq);
if (pdesc == nullptr)
if (pdesc == nullptr || (*pdesc)->mActions.Size() == 0)
{
return nullptr;
}
else
{
return F_StartIntermission(*pdesc, false);
auto desc = *pdesc;
auto action = desc->mActions[0];
if (action->mClass == TITLE_ID)
{
// is handled elsewhere.
return nullptr;
}
return F_StartIntermission(desc, false);
}
}