BTH/axyz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

EntityFileParser now ignores component fields not present in component definition instead of crashing.

Browse Source
This commit is contained in:
sippeangelo
2016-01-15 20:25:48 +01:00
parent db1b972cd1
commit 8bd5a428b9
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Engine/Core/EntityFileParser.cpp
+11 -2
View File
@@ -42,7 +42,12 @@ void EntityFileParser::onStartComponentField(EntityID entity, const std::string&
{ {
EntityID realEntity = m_EntityIDMapper.at(entity); EntityID realEntity = m_EntityIDMapper.at(entity);
ComponentWrapper component = m_World->GetComponent(realEntity, componentType); ComponentWrapper component = m_World->GetComponent(realEntity, componentType);
auto& field = component.Info.Fields.at(fieldName); auto fieldIt = component.Info.Fields.find(fieldName);
if (fieldIt == component.Info.Fields.end()) {
LOG_ERROR("Tried to set unknown field \"%s\" of component type \"%s\"! Ignoring.", fieldName.c_str(), componentType.c_str());
return;
}
auto& field = fieldIt->second;
LOG_DEBUG("Field \"%s\" type \"%s\"", fieldName.c_str(), field.Type.c_str()); LOG_DEBUG("Field \"%s\" type \"%s\"", fieldName.c_str(), field.Type.c_str());
LOG_DEBUG("Attributes:"); LOG_DEBUG("Attributes:");
@@ -58,7 +63,11 @@ void EntityFileParser::onFieldData(EntityID entity, const std::string& component
{ {
EntityID realEntity = m_EntityIDMapper.at(entity); EntityID realEntity = m_EntityIDMapper.at(entity);
ComponentWrapper component = m_World->GetComponent(realEntity, componentType); ComponentWrapper component = m_World->GetComponent(realEntity, componentType);
auto& field = component.Info.Fields.at(fieldName); auto fieldIt = component.Info.Fields.find(fieldName);
if (fieldIt == component.Info.Fields.end()) {
return;
}
auto& field = fieldIt->second;
char* data = component.Data + field.Offset; char* data = component.Data + field.Offset;
EntityFile::WriteValueData(data, field, fieldData); EntityFile::WriteValueData(data, field, fieldData);