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

Merge branch 'master' into powerslave

Browse source 
# Conflicts:
#	source/build/src/sdlayer.cpp
#	source/common/menu/menu.cpp
#	source/sw/src/config.cpp
#	source/sw/src/game.cpp
This commit is contained in:
Christoph Oelckers 2019-12-26 00:21:04 +01:00
commit 1a8f11e01d
315 changed files with 28483 additions and 53290 deletions
Download patch file Download diff file Expand all files Collapse all files

6
source/common/menu/menudef.cpp
View file

@ -67,7 +67,7 @@ void I_BuildMIDIMenuList(FOptionValues* opt);
void I_BuildALDeviceList(FOptionValues *opt);
void I_BuildALResamplersList(FOptionValues* opt);
static void DeinitMenus()
void M_DeinitMenus()
{
{
MenuDescriptorList::Iterator it(MenuDescriptors);
@ -94,6 +94,7 @@ static void DeinitMenus()
}
MenuDescriptors.Clear();
OptionValues.Clear();
DMenu::CurrentMenu = NULL;
DefaultListMenuSettings.mItems.Clear();
}
@ -1144,8 +1145,7 @@ void M_ParseMenuDefs()
DefaultListMenuSettings.Reset();
DefaultOptionMenuSettings.Reset();
atexit(DeinitMenus);
DeinitMenus();
M_DeinitMenus();
while ((lump = fileSystem.Iterate("demolition/menudef.txt", &lastlump)) != -1)
{
FScanner sc(lump);