From cd2cec3546482145fa2bcb59c1cc654582bf9bf1 Mon Sep 17 00:00:00 2001 From: Jan Date: Sun, 24 Oct 2021 22:04:31 +0200 Subject: [PATCH] Correctly handle referencing assets when dumping menulist --- src/ObjWriting/Game/IW4/AssetDumpers/AssetDumperMenuList.cpp | 5 ++++- src/ObjWriting/Game/IW5/AssetDumpers/AssetDumperMenuList.cpp | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/ObjWriting/Game/IW4/AssetDumpers/AssetDumperMenuList.cpp b/src/ObjWriting/Game/IW4/AssetDumpers/AssetDumperMenuList.cpp index 217f63a7..ed079e8f 100644 --- a/src/ObjWriting/Game/IW4/AssetDumpers/AssetDumperMenuList.cpp +++ b/src/ObjWriting/Game/IW4/AssetDumpers/AssetDumperMenuList.cpp @@ -80,9 +80,12 @@ void AssetDumperMenuList::DumpMenus(MenuDumper& menuDumper, const MenuList* menu for (auto menuNum = 0; menuNum < menuList->menuCount; menuNum++) { const auto* menu = menuList->menus[menuNum]; + const auto* menuAssetName = menu->window.name; + if (menuAssetName && menuAssetName[0] == ',') + menuAssetName = &menuAssetName[1]; std::ostringstream ss; - ss << parentPath << menu->window.name << ".menu"; + ss << parentPath << menuAssetName << ".menu"; const auto menuName = ss.str(); diff --git a/src/ObjWriting/Game/IW5/AssetDumpers/AssetDumperMenuList.cpp b/src/ObjWriting/Game/IW5/AssetDumpers/AssetDumperMenuList.cpp index 85b758be..b5909f78 100644 --- a/src/ObjWriting/Game/IW5/AssetDumpers/AssetDumperMenuList.cpp +++ b/src/ObjWriting/Game/IW5/AssetDumpers/AssetDumperMenuList.cpp @@ -80,9 +80,12 @@ void AssetDumperMenuList::DumpMenus(MenuDumper& menuDumper, const MenuList* menu for (auto menuNum = 0; menuNum < menuList->menuCount; menuNum++) { const auto* menu = menuList->menus[menuNum]; + const auto* menuAssetName = menu->window.name; + if (menuAssetName && menuAssetName[0] == ',') + menuAssetName = &menuAssetName[1]; std::ostringstream ss; - ss << parentPath << menu->window.name << ".menu"; + ss << parentPath << menuAssetName << ".menu"; const auto menuName = ss.str();