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

[Menus] Store if menu is native of custom instead of enumerating menus

Browse Source
This commit is contained in:
momo5502 2017-02-24 20:22:53 +01:00
parent 63e7426d8e
commit 04d09b39e0
2 changed files with 26 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -169,9 +169,9 @@ namespace Components
return menu; return menu;
} }
std::vector<Game::menuDef_t*> Menus::LoadMenu(std::string menu) std::vector<std::pair<bool, Game::menuDef_t*>> Menus::LoadMenu(std::string menu)
{ {
std::vector<Game::menuDef_t*> menus; std::vector<std::pair<bool, Game::menuDef_t*>> menus;
FileSystem::File menuFile(menu); FileSystem::File menuFile(menu);
if (menuFile.exists()) if (menuFile.exists())
@ -200,7 +200,7 @@ namespace Components
if (!_stricmp(token.string, "menudef")) if (!_stricmp(token.string, "menudef"))
{ {
Game::menuDef_t* menudef = Menus::ParseMenu(handle); Game::menuDef_t* menudef = Menus::ParseMenu(handle);
if (menudef) menus.push_back(menudef); if (menudef) menus.push_back({ true, menudef }); // Custom menu
} }
} }
@ -211,9 +211,9 @@ namespace Components
return menus; return menus;
} }
std::vector<Game::menuDef_t*> Menus::LoadMenu(Game::menuDef_t* menudef) std::vector<std::pair<bool, Game::menuDef_t*>> Menus::LoadMenu(Game::menuDef_t* menudef)
{ {
std::vector<Game::menuDef_t*> menus = Menus::LoadMenu(Utils::String::VA("ui_mp\\%s.menu", menudef->window.name)); std::vector<std::pair<bool, Game::menuDef_t*>> menus = Menus::LoadMenu(Utils::String::VA("ui_mp\\%s.menu", menudef->window.name));
if (menus.empty()) if (menus.empty())
{ {
@ -222,11 +222,11 @@ namespace Components
// //
// if (originalMenu) // if (originalMenu)
// { // {
// menus.push_back(originalMenu); // menus.push_back({ false, originalMenu });
// } // }
// else // else
// { // {
menus.push_back(menudef); menus.push_back({ false, menudef }); // Native menu
// } // }
} }
@ -235,7 +235,7 @@ namespace Components
Game::MenuList* Menus::LoadScriptMenu(const char* menu) Game::MenuList* Menus::LoadScriptMenu(const char* menu)
{ {
std::vector<Game::menuDef_t*> menus = Menus::LoadMenu(menu); std::vector<std::pair<bool, Game::menuDef_t*>> menus = Menus::LoadMenu(menu);
if (menus.empty()) return nullptr; if (menus.empty()) return nullptr;
// Allocate new menu list // Allocate new menu list
@ -253,7 +253,10 @@ namespace Components
newList->menuCount = menus.size(); newList->menuCount = menus.size();
// Copy new menus // Copy new menus
std::memcpy(newList->menus, menus.data(), menus.size() * sizeof(Game::menuDef_t *)); for(unsigned int i = 0; i < menus.size(); ++i)
{
newList->menus[i] = menus[i].second;
}
Menus::RemoveMenuList(newList->name); Menus::RemoveMenuList(newList->name);
Menus::MenuListList[newList->name] = newList; Menus::MenuListList[newList->name] = newList;
@ -261,31 +264,20 @@ namespace Components
return newList; return newList;
} }
void Menus::SafeMergeMenus(std::vector<Game::menuDef_t*>* menus, std::vector<Game::menuDef_t*> newMenus) void Menus::SafeMergeMenus(std::vector<std::pair<bool, Game::menuDef_t*>>* menus, std::vector<std::pair<bool, Game::menuDef_t*>> newMenus)
{ {
// Check if we overwrote a menu // Check if we overwrote a menu
for (unsigned int i = 0; i < menus->size(); ++i) for (unsigned int i = 0; i < menus->size(); ++i)
{ {
// Try to find the native menu // Try to find the native menu
bool found = false; bool found = !menus->at(i).first; // Only if custom menu, try to find it
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 there is none, try to find a custom menu
if (!found) if (!found)
{ {
for (auto& entry : Menus::MenuList) for (auto& entry : Menus::MenuList)
{ {
if (menus->at(i) == entry.second) if (menus->at(i).second == entry.second)
{ {
found = true; found = true;
break; break;
@ -304,9 +296,9 @@ namespace Components
// Remove the menu if it has been loaded twice // Remove the menu if it has been loaded twice
for (auto& newMenu : newMenus) for (auto& newMenu : newMenus)
{ {
if (menus->at(i)->window.name == std::string(newMenu->window.name)) if (menus->at(i).second->window.name == std::string(newMenu.second->window.name))
{ {
Menus::RemoveMenu(menus->at(i)); Menus::RemoveMenu(menus->at(i).second);
menus->erase(menus->begin() + i); menus->erase(menus->begin() + i);
--i; --i;
@ -320,7 +312,7 @@ namespace Components
Game::MenuList* Menus::LoadMenuList(Game::MenuList* menuList) Game::MenuList* Menus::LoadMenuList(Game::MenuList* menuList)
{ {
std::vector<Game::menuDef_t*> menus; std::vector<std::pair<bool, Game::menuDef_t*>> menus;
for (int i = 0; i < menuList->menuCount; ++i) for (int i = 0; i < menuList->menuCount; ++i)
{ {
@ -336,7 +328,7 @@ namespace Components
bool hasMenu = false; bool hasMenu = false;
for(auto &loadedMenu : menus) for(auto &loadedMenu : menus)
{ {
if(loadedMenu->window.name == menu) if(loadedMenu.second->window.name == menu)
{ {
hasMenu = true; hasMenu = true;
break; break;
@ -363,7 +355,10 @@ namespace Components
newList->menuCount = size; newList->menuCount = size;
// Copy new menus // Copy new menus
std::memcpy(newList->menus, menus.data(), size * sizeof(Game::menuDef_t *)); for (unsigned int i = 0; i < menus.size(); ++i)
{
newList->menus[i] = menus[i].second;
}
Menus::RemoveMenuList(newList->name); Menus::RemoveMenuList(newList->name);
Menus::MenuListList[newList->name] = newList; Menus::MenuListList[newList->name] = newList;

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

@ -29,9 +29,9 @@ namespace Components
static Game::MenuList* LoadMenuList(Game::MenuList* menuList); static Game::MenuList* LoadMenuList(Game::MenuList* menuList);
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<std::pair<bool, Game::menuDef_t*>> LoadMenu(Game::menuDef_t* menudef);
static std::vector<Game::menuDef_t*> LoadMenu(std::string file); static std::vector<std::pair<bool, Game::menuDef_t*>> LoadMenu(std::string file);
static void SafeMergeMenus(std::vector<Game::menuDef_t*>* menus, std::vector<Game::menuDef_t*> newMenus); static void SafeMergeMenus(std::vector<std::pair<bool, Game::menuDef_t*>>* menus, std::vector<std::pair<bool, 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);