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

Add supplemental data for iw4 statemap layout

Browse Source
This commit is contained in:
Jan
2022-08-20 14:37:05 +02:00
parent b93707dfe5
commit 2dd8660824
6 changed files with 401 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/ObjLoading/StateMap/Parsing/StateMapParserState.cpp
View File

@ -4,11 +4,11 @@ using namespace state_map;
StateMapParserState::StateMapParserState(std::string stateMapName, const StateMapLayout& layout)
: m_layout(layout),
m_definition(std::make_unique<StateMapDefinition>(std::move(stateMapName), layout.m_layout_entries.size())),
m_definition(std::make_unique<StateMapDefinition>(std::move(stateMapName), layout.m_entry_layout.m_entries.size())),
m_in_entry(false),
m_current_entry_index(0u),
m_current_rule(nullptr)
{
for (auto i = 0u; i < m_layout.m_layout_entries.size(); i++)
m_valid_state_map_entry_names.emplace(m_layout.m_layout_entries[i].m_name, i);
for (auto i = 0u; i < m_layout.m_entry_layout.m_entries.size(); i++)
m_valid_state_map_entry_names.emplace(m_layout.m_entry_layout.m_entries[i].m_name, i);
}

4
src/ObjLoading/StateMap/StateMapReader.cpp
View File

@ -31,11 +31,11 @@ bool StateMapReader::IsValidEndState(const StateMapParserState* state) const
return false;
}
for (auto i = 0u; i < state->m_layout.m_layout_entries.size(); i++)
for (auto i = 0u; i < state->m_layout.m_entry_layout.m_entries.size(); i++)
{
if (state->m_definition->m_state_map_entries[i].m_rules.empty())
{
std::cerr << "In \"" << m_file_name << "\": State map must define a rule for \"" << state->m_layout.m_layout_entries[i].m_name << "\"!\n";
std::cerr << "In \"" << m_file_name << "\": State map must define a rule for \"" << state->m_layout.m_entry_layout.m_entries[i].m_name << "\"!\n";
return false;
}
}