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

[Menus] Fix scriptmenu error

Browse Source
This commit is contained in:
momo5502 2017-02-18 22:52:42 +01:00
parent 8be08154c5
commit b58e235653
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -511,9 +511,6 @@ namespace Components
{ {
Game::XAssetHeader header = { nullptr }; Game::XAssetHeader header = { nullptr };
Game::MenuList* menuList = Game::DB_FindXAssetHeader(type, filename.data()).menuList;
header.menuList = menuList;
// Free the last menulist and ui context, as we have to rebuild it with the new menus // Free the last menulist and ui context, as we have to rebuild it with the new menus
if (Menus::MenuListList.find(filename) != Menus::MenuListList.end()) if (Menus::MenuListList.find(filename) != Menus::MenuListList.end())
{ {
@ -527,10 +524,22 @@ namespace Components
Menus::RemoveMenuList(filename); Menus::RemoveMenuList(filename);
} }
if(Utils::String::EndsWith(filename, ".menu"))
{
if (FileSystem::File(filename).exists())
{
header.menuList = Menus::LoadScriptMenu(filename.data());
if (header.menuList) return header;
}
}
Game::MenuList* menuList = Game::DB_FindXAssetHeader(type, filename.data()).menuList;
header.menuList = menuList;
if (menuList && reinterpret_cast<DWORD>(menuList) != 0xDDDDDDDD) if (menuList && reinterpret_cast<DWORD>(menuList) != 0xDDDDDDDD)
{ {
// Parse scriptmenus! // Parse scriptmenus!
if ((menuList->menuCount > 0 && menuList->menus[0] && menuList->menus[0]->window.name == "default_menu"s) || Utils::String::EndsWith(filename, ".menu")) if ((menuList->menuCount > 0 && menuList->menus[0] && menuList->menus[0]->window.name == "default_menu"s))
{ {
if (FileSystem::File(filename).exists()) if (FileSystem::File(filename).exists())
{ {