zone/OpenAssetTools
2
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2026-07-19 14:30:37 +00:00
Code Activity

fix: assign ownerdraw item type when parsing menus (#911)

Browse Source 
Set `m_type` to `ITEM_TYPE_OWNERDRAW` when parsing an `ownerdraw` property. Otherwise, it retains the default `ITEM_TYPE_TEXT`.

This restores controls such as the Source button in the IW4x server browser.
This commit is contained in:
mo
2026-07-17 18:26:50 +02:00
committed by GitHub
parent a87850d36e
commit 0c1efa1667
2 changed files with 25 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ObjLoading/Parsing/Menu/Sequence/ItemScopeSequences.cpp
+3
View File
@@ -17,6 +17,8 @@
using namespace menu;
constexpr auto ITEM_TYPE_OWNERDRAW = 8;
class ItemScopeOperations
{
inline static const CommonItemFeatureType IW4_FEATURE_TYPE_BY_TYPE[0x18]{
@@ -705,6 +707,7 @@ void ItemScopeSequences::AddSequences(FeatureLevel featureLevel, bool permissive
AddSequence(std::make_unique<GenericIntPropertySequence>("ownerdraw",
[](const MenuFileParserState* state, const TokenPos&, const int value)
{
state->m_current_item->m_type = ITEM_TYPE_OWNERDRAW;
state->m_current_item->m_owner_draw = value;
}));
AddSequence(std::make_unique<GenericIntPropertySequence>("align",
test/ObjLoadingTests/Parsing/Menu/Sequence/ItemScopeSequencesTests.cpp
+22
View File
@@ -334,6 +334,28 @@ namespace test::parsing::menu::sequence::item
REQUIRE(item->m_rect.verticalAlign == 0);
}
TEST_CASE("ItemScopeSequences: Ownerdraw sets the ownerdraw item type", "[parsing][sequence][menu]")
{
ItemSequenceTestsHelper helper(FeatureLevel::IW4, false);
const TokenPos pos;
helper.Tokens({
SimpleParserValue::Identifier(pos, new std::string("ownerdraw")),
SimpleParserValue::Integer(pos, 220),
SimpleParserValue::EndOfFile(pos),
});
const auto result = helper.PerformTest();
REQUIRE(result);
REQUIRE(helper.m_consumed_token_count == 2);
const auto* item = helper.m_state->m_current_item;
REQUIRE(item);
REQUIRE(item->m_owner_draw == 220);
REQUIRE(item->m_type == 8); // ITEM_TYPE_OWNERDRAW
}
TEST_CASE("ItemScopeSequences: Simple dvarStrList works", "[parsing][sequence][menu]")
{
ItemSequenceTestsHelper helper(FeatureLevel::IW4, false);