OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge https://github.com/coelckers/gzdoom

Browse source
This commit is contained in:
Rachael Alexanderson 2017-06-10 01:00:38 -04:00
commit a48203ef1d
3 changed files with 16 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/menu/menudef.cpp
View file

@ -512,7 +512,7 @@ static void ParseListMenuBody(FScanner &sc, DListMenuDescriptor *desc)
static bool CheckCompatible(DMenuDescriptor *newd, DMenuDescriptor *oldd)
{
if (oldd->mClass == nullptr) return true;
return oldd->mClass == newd->mClass;
return newd->mClass->IsDescendantOf(oldd->mClass);
}
static bool ReplaceMenu(FScanner &sc, DMenuDescriptor *desc)