Rim/iw4x-client
Rim/iw4x-client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

[Menus] Separate playerdataread and restclass menu

Browse Source
This commit is contained in:
momo5502 2017-02-22 20:38:19 +01:00
parent e7c2d10d19
commit 070c7ac00a
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/Components/Modules/Menus.cpp
View File

@ -276,7 +276,17 @@ namespace Components
{ {
for (auto menu : Menus::CustomMenus) for (auto menu : Menus::CustomMenus)
{ {
Utils::Merge(&menus, Menus::LoadMenu(menu)); bool hasMenu = false;
for(auto &loadedMenu : menus)
{
if(loadedMenu->window.name == menu)
{
hasMenu = true;
break;
}
}
if(!hasMenu) Utils::Merge(&menus, Menus::LoadMenu(menu));
} }
} }
@ -710,6 +720,7 @@ namespace Components
Menus::Add("ui_mp/startup_messages.menu"); Menus::Add("ui_mp/startup_messages.menu");
Menus::Add("ui_mp/pc_store.menu"); Menus::Add("ui_mp/pc_store.menu");
Menus::Add("ui_mp/iw4x_credits.menu"); Menus::Add("ui_mp/iw4x_credits.menu");
Menus::Add("ui_mp/resetclass.menu");
} }
Menus::~Menus() Menus::~Menus()