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

[Menus] Safely merge menus when loading them

Browse Source
This commit is contained in:
momo5502 2017-02-24 12:15:15 +01:00
parent 1d7006c420
commit d3ca680e7a
2 changed files with 60 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -261,6 +261,63 @@ namespace Components
return newList; return newList;
} }
void Menus::SafeMergeMenus(std::vector<Game::menuDef_t*>* menus, std::vector<Game::menuDef_t*> newMenus)
{
// Check if we overwrote a menu
for (unsigned int i = 0; i < menus->size(); ++i)
{
// Try to find the native menu
bool found = false;
std::pair<Game::menuDef_t*, bool*> pair(menus->at(i), &found);
Game::DB_EnumXAssets_Internal(Game::XAssetType::ASSET_TYPE_MENU, [](Game::XAssetHeader header, void* data)
{
std::pair<Game::menuDef_t*, bool*>* pairPtr = reinterpret_cast<std::pair<Game::menuDef_t*, bool*>*>(data);
if(pairPtr->first == header.menu)
{
*pairPtr->second = true;
}
}, &pair, false);
// If there is none, try to find a custom menu
if (!found)
{
for (auto& entry : Menus::MenuList)
{
if (menus->at(i) == entry.second)
{
found = true;
break;
}
}
}
// Remove the menu if it has been deallocated (not found)
if (!found)
{
menus->erase(menus->begin() + i);
--i;
continue;
}
// Remove the menu if it has been loaded twice
for (auto& newMenu : newMenus)
{
if (menus->at(i)->window.name == std::string(newMenu->window.name))
{
Menus::RemoveMenu(menus->at(i));
menus->erase(menus->begin() + i);
--i;
break;
}
}
}
Utils::Merge(menus, newMenus);
}
Game::MenuList* Menus::LoadMenuList(Game::MenuList* menuList) Game::MenuList* Menus::LoadMenuList(Game::MenuList* menuList)
{ {
std::vector<Game::menuDef_t*> menus; std::vector<Game::menuDef_t*> menus;
@ -268,7 +325,7 @@ namespace Components
for (int i = 0; i < menuList->menuCount; ++i) for (int i = 0; i < menuList->menuCount; ++i)
{ {
if (!menuList->menus[i]) continue; if (!menuList->menus[i]) continue;
Utils::Merge(&menus, Menus::LoadMenu(menuList->menus[i])); Menus::SafeMergeMenus(&menus, Menus::LoadMenu(menuList->menus[i]));
} }
// Load custom menus // Load custom menus
@ -286,7 +343,7 @@ namespace Components
} }
} }
if(!hasMenu) Utils::Merge(&menus, Menus::LoadMenu(menu)); if (!hasMenu) Menus::SafeMergeMenus(&menus, Menus::LoadMenu(menu));
} }
} }

1
src/Components/Modules/Menus.hpp
View File

@ -31,6 +31,7 @@ namespace Components
static Game::MenuList* LoadScriptMenu(const char* menu); static Game::MenuList* LoadScriptMenu(const char* menu);
static std::vector<Game::menuDef_t*> LoadMenu(Game::menuDef_t* menudef); static std::vector<Game::menuDef_t*> LoadMenu(Game::menuDef_t* menudef);
static std::vector<Game::menuDef_t*> LoadMenu(std::string file); static std::vector<Game::menuDef_t*> LoadMenu(std::string file);
static void SafeMergeMenus(std::vector<Game::menuDef_t*>* menus, std::vector<Game::menuDef_t*> newMenus);
static Game::script_t* LoadMenuScript(std::string name, std::string buffer); static Game::script_t* LoadMenuScript(std::string name, std::string buffer);
static int LoadMenuSource(std::string name, std::string buffer); static int LoadMenuSource(std::string name, std::string buffer);