zone/OpenAssetTools
2
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2025-07-01 08:41:52 +00:00
Code Activity

feat: log invalid enum values for infostring loaders

Browse Source
This commit is contained in:
Jan
2024-05-09 20:38:23 +02:00
parent 176b70f416
commit 28610ae7a9
10 changed files with 82 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/ObjLoading/InfoString/InfoStringToStructConverterBase.cpp
View File

@ -2,6 +2,7 @@
#include <cstring>
#include <iostream>
#include <sstream>
InfoStringToStructConverterBase::InfoStringToStructConverterBase(const InfoString& infoString,
void* structure,
@ -148,7 +149,8 @@ bool InfoStringToStructConverterBase::ConvertScriptString(const std::string& val
return true;
}
bool InfoStringToStructConverterBase::ConvertEnumInt(const std::string& value, const size_t offset, const char** enumValues, const size_t enumSize)
bool InfoStringToStructConverterBase::ConvertEnumInt(
const std::string& fieldName, const std::string& value, const size_t offset, const char** enumValues, const size_t enumSize)
{
for (auto i = 0u; i < enumSize; i++)
{
@ -159,6 +161,19 @@ bool InfoStringToStructConverterBase::ConvertEnumInt(const std::string& value, c
}
}
std::ostringstream ss;
ss << "Not a valid value for field \"" << fieldName << "\": \"" << value << "\". Valid values are:\n ";
for (auto i = 0u; i < enumSize; i++)
{
if (i > 0)
ss << ", ";
ss << '"' << enumValues[i] << '"';
}
ss << '\n';
std::cerr << ss.str();
return false;
}

2
src/ObjLoading/InfoString/InfoStringToStructConverterBase.h
View File

@ -110,7 +110,7 @@ protected:
bool ConvertFloat(const std::string& value, size_t offset);
bool ConvertMilliseconds(const std::string& value, size_t offset);
bool ConvertScriptString(const std::string& value, size_t offset);
bool ConvertEnumInt(const std::string& value, size_t offset, const char** enumValues, size_t enumSize);
bool ConvertEnumInt(const std::string& fieldName, const std::string& value, size_t offset, const char** enumValues, size_t enumSize);
public:
InfoStringToStructConverterBase(const InfoString& infoString, void* structure, ZoneScriptStrings& zoneScriptStrings, MemoryManager* memory);