INSANEMODE/OpenAssetTools
1
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2025-06-18 10:47:57 -05:00
Code Issues Packages Projects Releases Wiki Activity

Initialize default values of menus via class level defaults

Browse Source
This commit is contained in:
Jan
2021-12-29 13:50:45 +01:00
parent bf7e136c54
commit f30bbd65da
6 changed files with 92 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/ObjLoading/Parsing/Menu/Sequence/GlobalScopeSequences.cpp
View File

@ -61,17 +61,10 @@ namespace menu::global_scope_sequences
});
}
private:
static void ApplyDefaults(CommonMenuDef& menu)
{
menu.m_fore_color = CommonColor(1.0, 1.0, 1.0, 1.0);
}
protected:
void ProcessMatch(MenuFileParserState* state, SequenceResult<SimpleParserValue>& result) const override
{
auto newMenu = std::make_unique<CommonMenuDef>();
ApplyDefaults(*newMenu);
state->m_current_menu = newMenu.get();
state->m_menus.emplace_back(std::move(newMenu));
}

7
src/ObjLoading/Parsing/Menu/Sequence/MenuScopeSequences.cpp
View File

@ -86,17 +86,10 @@ namespace menu::menu_scope_sequences
});
}
private:
static void ApplyDefaults(CommonItemDef& item)
{
item.m_fore_color = CommonColor(1.0, 1.0, 1.0, 1.0);
}
protected:
void ProcessMatch(MenuFileParserState* state, SequenceResult<SimpleParserValue>& result) const override
{
auto newItemDef = std::make_unique<CommonItemDef>();
ApplyDefaults(*newItemDef);
state->m_current_item = newItemDef.get();
state->m_current_menu->m_items.emplace_back(std::move(newItemDef));
}