zone/OpenAssetTools
2
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2026-09-22 22:07:08 +00:00
Code Activity

fix: preserve special menu item text flags (#1011)

Browse Source 
* fix: preserve T4 special menu item text flags

* fix: preserve IW3 special menu item text flags

* refactor: define IW3 and T4 dynamic window flags

* chore: also apply WindowDefDynamicFlag changes to iw4 and iw5

---------

Co-authored-by: Jan Laupetin <[email protected]>
This commit is contained in:
mo
2026-09-20 21:20:54 +02:00
committed by GitHub
co-authored by Jan Laupetin
parent f16dd0cffd
commit 6ca37c43fa
12 changed files with 271 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/ObjLoadingTests/Game/IW3/Menu/LoaderMenuListIW3Test.cpp
+21 -3
View File
@@ -104,6 +104,16 @@ namespace
exp material (localvarstring("ui_material"));
}
itemDef
{
name "save_game_info"
textsavegame
}
itemDef
{
name "cinematic_subtitle"
textcinematicsubtitle
}
itemDef
{
name "server_list"
rect 20 60 300 200 0 0
@@ -171,7 +181,7 @@ namespace
REQUIRE(mainMenu->visibleExp.entries[2]->data.op == OP_RIGHTPAREN);
REQUIRE(mainMenu->onOpen == R"("play" "menu_open" ; "setLocalVarInt" "ui_highlight" "5" ; )"s);
REQUIRE(mainMenu->itemCount == 3);
REQUIRE(mainMenu->itemCount == 5);
const auto* emptyTextItem = mainMenu->items[0];
REQUIRE(emptyTextItem->parent == mainMenu);
REQUIRE(emptyTextItem->text != nullptr);
@@ -185,7 +195,15 @@ namespace
REQUIRE(emptyTextItem->materialExp.numEntries == 3);
REQUIRE(emptyTextItem->materialExp.entries[0]->data.op == OP_LOCALVARSTRING);
const auto* listItem = mainMenu->items[1];
const auto* saveGameInfoItem = mainMenu->items[1];
REQUIRE(saveGameInfoItem->text == "savegameinfo"s);
REQUIRE(saveGameInfoItem->itemFlags == ITEM_FLAG_SAVE_GAME_INFO);
const auto* cinematicSubtitleItem = mainMenu->items[2];
REQUIRE(cinematicSubtitleItem->text == "cinematicsubtitle"s);
REQUIRE(cinematicSubtitleItem->itemFlags == ITEM_FLAG_CINEMATIC_SUBTITLE);
const auto* listItem = mainMenu->items[3];
REQUIRE(listItem->typeData.listBox);
REQUIRE(listItem->typeData.listBox->numColumns == 2);
REQUIRE(listItem->typeData.listBox->columnInfo[1].pos == 120);
@@ -197,7 +215,7 @@ namespace
REQUIRE(listItem->typeData.listBox->selectIcon == selectMaterial);
REQUIRE(listItem->typeData.listBox->onDoubleClick == R"("play" "mouse_click" ; )"s);
const auto* defaultTextItem = mainMenu->items[2];
const auto* defaultTextItem = mainMenu->items[4];
REQUIRE(defaultTextItem->type == 0);
REQUIRE(defaultTextItem->typeData.editField);
REQUIRE(defaultTextItem->typeData.editField->maxChars == 2);
test/ObjLoadingTests/Game/T4/Menu/LoaderMenuListT4Test.cpp
+21 -3
View File
@@ -110,6 +110,16 @@ namespace
exp material (localvarstring("ui_material"));
}
itemDef
{
name "save_game_info"
textsavegame
}
itemDef
{
name "cinematic_subtitle"
textcinematicsubtitle
}
itemDef
{
name "server_list"
rect 20 60 300 200 0 0
@@ -186,7 +196,7 @@ namespace
REQUIRE(mainMenu->onOpen == R"("play" "menu_open" ; "setLocalVarInt" "ui_highlight" "5" ; )"s);
REQUIRE(mainMenu->onFocus == R"("setdvar" "ui_menu_focused" "1" ; )"s);
REQUIRE(mainMenu->itemCount == 3);
REQUIRE(mainMenu->itemCount == 5);
const auto* emptyTextItem = mainMenu->items[0];
REQUIRE(emptyTextItem->parent == mainMenu);
REQUIRE(emptyTextItem->text != nullptr);
@@ -200,7 +210,15 @@ namespace
REQUIRE(emptyTextItem->materialExp.numEntries == 3);
REQUIRE(emptyTextItem->materialExp.entries[0]->data.op == OP_LOCALVARSTRING);
const auto* listItem = mainMenu->items[1];
const auto* saveGameInfoItem = mainMenu->items[1];
REQUIRE(saveGameInfoItem->text == "savegameinfo"s);
REQUIRE(saveGameInfoItem->itemFlags == ITEM_FLAG_SAVE_GAME_INFO);
const auto* cinematicSubtitleItem = mainMenu->items[2];
REQUIRE(cinematicSubtitleItem->text == "cinematicsubtitle"s);
REQUIRE(cinematicSubtitleItem->itemFlags == ITEM_FLAG_CINEMATIC_SUBTITLE);
const auto* listItem = mainMenu->items[3];
REQUIRE(listItem->typeData.listBox);
REQUIRE(listItem->typeData.listBox->numColumns == 2);
REQUIRE(listItem->typeData.listBox->columnInfo[1].pos == 120);
@@ -216,7 +234,7 @@ namespace
REQUIRE(listItem->typeData.listBox->onDoubleClick == R"("play" "mouse_click" ; )"s);
REQUIRE(listItem->onListboxSelectionChange == R"("setdvar" "ui_server_selected" "1" ; )"s);
const auto* defaultTextItem = mainMenu->items[2];
const auto* defaultTextItem = mainMenu->items[4];
REQUIRE(defaultTextItem->type == 0);
REQUIRE(defaultTextItem->typeData.editField);
REQUIRE(defaultTextItem->typeData.editField->maxChars == 2);
test/ObjWritingTests/Game/IW3/Menu/MenuDumperIW3Test.cpp
+61
View File
@@ -353,6 +353,67 @@ namespace
REQUIRE(parsed->m_menus[0]->m_items[1]->m_dvar == "player_name");
}
TEST_CASE("MenuDumperIW3: Dumps special item text flags", "[iw3][menu][assetdumper]")
{
itemDef_s saveGameInfo{};
saveGameInfo.window.name = "save_game_info";
saveGameInfo.text = "savegameinfo";
saveGameInfo.itemFlags = ITEM_FLAG_SAVE_GAME_INFO;
itemDef_s cinematicSubtitle{};
cinematicSubtitle.window.name = "cinematic_subtitle";
cinematicSubtitle.text = "cinematicsubtitle";
cinematicSubtitle.itemFlags = ITEM_FLAG_CINEMATIC_SUBTITLE;
itemDef_s customSaveGameInfo{};
customSaveGameInfo.window.name = "custom_save_game_info";
customSaveGameInfo.text = "custom save game text";
customSaveGameInfo.itemFlags = ITEM_FLAG_SAVE_GAME_INFO;
itemDef_s* items[]{&saveGameInfo, &cinematicSubtitle, &customSaveGameInfo};
menuDef_t menu{};
menu.window.name = "special_item_text";
menu.itemCount = static_cast<int>(std::size(items));
menu.items = items;
Zone zone("MockZone", 0, GameId::IW3, GamePlatform::PC);
zone.m_pools.AddAsset(std::make_unique<XAssetInfo<menuDef_t>>(ASSET_TYPE_MENU, menu.window.name, &menu));
MockSearchPath mockObjPath;
MockOutputPath mockOutput;
AssetDumpingContext context(zone, "", mockOutput, mockObjPath, std::nullopt);
menu::MenuDumperIW3 dumper;
dumper.Dump(context);
const auto* file = mockOutput.GetMockedFile("ui_mp/special_item_text.menu");
REQUIRE(file);
const auto output = file->AsString();
const auto saveGameInfoPosition = output.find("save_game_info");
const auto cinematicSubtitlePosition = output.find("cinematic_subtitle", saveGameInfoPosition);
const auto customSaveGameInfoPosition = output.find("custom_save_game_info", cinematicSubtitlePosition);
REQUIRE(saveGameInfoPosition != std::string::npos);
REQUIRE(cinematicSubtitlePosition != std::string::npos);
REQUIRE(customSaveGameInfoPosition != std::string::npos);
const auto saveGameInfoOutput = output.substr(saveGameInfoPosition, cinematicSubtitlePosition - saveGameInfoPosition);
REQUIRE(saveGameInfoOutput.find("textsavegame") != std::string::npos);
REQUIRE(saveGameInfoOutput.find("\"savegameinfo\"") == std::string::npos);
const auto cinematicSubtitleOutput = output.substr(cinematicSubtitlePosition, customSaveGameInfoPosition - cinematicSubtitlePosition);
REQUIRE(cinematicSubtitleOutput.find("textcinematicsubtitle") != std::string::npos);
REQUIRE(cinematicSubtitleOutput.find("\"cinematicsubtitle\"") == std::string::npos);
const auto customSaveGameInfoOutput = output.substr(customSaveGameInfoPosition);
const auto customKeywordPosition = customSaveGameInfoOutput.find("textsavegame");
const auto customTextPosition = customSaveGameInfoOutput.find("\"custom save game text\"");
REQUIRE(customKeywordPosition != std::string::npos);
REQUIRE(customTextPosition != std::string::npos);
REQUIRE(customKeywordPosition < customTextPosition);
}
TEST_CASE("MenuDumperIW3: Prefers parent menu list path over ui_mp fallback", "[iw3][menu][assetdumper]")
{
menuDef_t menu{};
test/ObjWritingTests/Game/T4/Menu/MenuDumperT4Test.cpp
+61
View File
@@ -353,6 +353,67 @@ namespace
REQUIRE(parsed->m_menus[0]->m_items[1]->m_dvar == "player_name");
}
TEST_CASE("MenuDumperT4: Dumps special item text flags", "[t4][menu][assetdumper]")
{
itemDef_s saveGameInfo{};
saveGameInfo.window.name = "save_game_info";
saveGameInfo.text = "savegameinfo";
saveGameInfo.itemFlags = ITEM_FLAG_SAVE_GAME_INFO;
itemDef_s cinematicSubtitle{};
cinematicSubtitle.window.name = "cinematic_subtitle";
cinematicSubtitle.text = "cinematicsubtitle";
cinematicSubtitle.itemFlags = ITEM_FLAG_CINEMATIC_SUBTITLE;
itemDef_s customSaveGameInfo{};
customSaveGameInfo.window.name = "custom_save_game_info";
customSaveGameInfo.text = "custom save game text";
customSaveGameInfo.itemFlags = ITEM_FLAG_SAVE_GAME_INFO;
itemDef_s* items[]{&saveGameInfo, &cinematicSubtitle, &customSaveGameInfo};
menuDef_t menu{};
menu.window.name = "special_item_text";
menu.itemCount = static_cast<int>(std::size(items));
menu.items = items;
Zone zone("MockZone", 0, GameId::T4, GamePlatform::PC);
zone.m_pools.AddAsset(std::make_unique<XAssetInfo<menuDef_t>>(ASSET_TYPE_MENU, menu.window.name, &menu));
MockSearchPath mockObjPath;
MockOutputPath mockOutput;
AssetDumpingContext context(zone, "", mockOutput, mockObjPath, std::nullopt);
menu::MenuDumperT4 dumper;
dumper.Dump(context);
const auto* file = mockOutput.GetMockedFile("ui_mp/special_item_text.menu");
REQUIRE(file);
const auto output = file->AsString();
const auto saveGameInfoPosition = output.find("save_game_info");
const auto cinematicSubtitlePosition = output.find("cinematic_subtitle", saveGameInfoPosition);
const auto customSaveGameInfoPosition = output.find("custom_save_game_info", cinematicSubtitlePosition);
REQUIRE(saveGameInfoPosition != std::string::npos);
REQUIRE(cinematicSubtitlePosition != std::string::npos);
REQUIRE(customSaveGameInfoPosition != std::string::npos);
const auto saveGameInfoOutput = output.substr(saveGameInfoPosition, cinematicSubtitlePosition - saveGameInfoPosition);
REQUIRE(saveGameInfoOutput.find("textsavegame") != std::string::npos);
REQUIRE(saveGameInfoOutput.find("\"savegameinfo\"") == std::string::npos);
const auto cinematicSubtitleOutput = output.substr(cinematicSubtitlePosition, customSaveGameInfoPosition - cinematicSubtitlePosition);
REQUIRE(cinematicSubtitleOutput.find("textcinematicsubtitle") != std::string::npos);
REQUIRE(cinematicSubtitleOutput.find("\"cinematicsubtitle\"") == std::string::npos);
const auto customSaveGameInfoOutput = output.substr(customSaveGameInfoPosition);
const auto customKeywordPosition = customSaveGameInfoOutput.find("textsavegame");
const auto customTextPosition = customSaveGameInfoOutput.find("\"custom save game text\"");
REQUIRE(customKeywordPosition != std::string::npos);
REQUIRE(customTextPosition != std::string::npos);
REQUIRE(customKeywordPosition < customTextPosition);
}
TEST_CASE("MenuDumperT4: Prefers parent menu list path over ui_mp fallback", "[t4][menu][assetdumper]")
{
menuDef_t menu{};