zone/OpenAssetTools
zone/OpenAssetTools
2
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2025-04-21 00:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make InfoStringDumper scriptstring callback return std::string instead of const std::string& since a reference is not needed

Browse Source
This commit is contained in:
Jan 2020-10-23 13:26:32 +02:00
parent 99195232bb
commit 2e61f46544
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ObjCommon/Game/T6/InfoStringT6.cpp
View File

@ -158,7 +158,7 @@ InfoStringFromStructConverter::InfoStringFromStructConverter(const void* structu
} }
InfoStringFromStructConverter::InfoStringFromStructConverter(const void* structure, const cspField_t* fields, const size_t fieldCount, InfoStringFromStructConverter::InfoStringFromStructConverter(const void* structure, const cspField_t* fields, const size_t fieldCount,
std::function<const std::string&(scr_string_t)> scriptStringValueCallback) std::function<std::string(scr_string_t)> scriptStringValueCallback)
: InfoStringFromStructConverterBase(structure, std::move(scriptStringValueCallback)), : InfoStringFromStructConverterBase(structure, std::move(scriptStringValueCallback)),
m_fields(fields), m_fields(fields),
m_field_count(fieldCount) m_field_count(fieldCount)

2
src/ObjCommon/Game/T6/InfoStringT6.h
View File

@ -28,6 +28,6 @@ namespace T6
public: public:
InfoStringFromStructConverter(const void* structure, const cspField_t* fields, size_t fieldCount); InfoStringFromStructConverter(const void* structure, const cspField_t* fields, size_t fieldCount);
InfoStringFromStructConverter(const void* structure, const cspField_t* fields, size_t fieldCount, std::function<const std::string&(scr_string_t)> scriptStringValueCallback); InfoStringFromStructConverter(const void* structure, const cspField_t* fields, size_t fieldCount, std::function<std::string(scr_string_t)> scriptStringValueCallback);
}; };
} }

4
src/ObjCommon/Utils/InfoString.cpp
View File

@ -117,7 +117,7 @@ InfoStringFromStructConverterBase::InfoStringFromStructConverterBase(const void*
{ {
} }
InfoStringFromStructConverterBase::InfoStringFromStructConverterBase(const void* structure, std::function<const std::string&(scr_string_t)> scriptStringValueCallback) InfoStringFromStructConverterBase::InfoStringFromStructConverterBase(const void* structure, std::function<std::string(scr_string_t)> scriptStringValueCallback)
: m_structure(structure), : m_structure(structure),
m_get_scr_string(std::move(scriptStringValueCallback)) m_get_scr_string(std::move(scriptStringValueCallback))
{ {
@ -132,7 +132,7 @@ InfoString InfoStringFromStructConverterBase::Convert()
return std::move(m_info_string); return std::move(m_info_string);
} }
void InfoStringFromStructConverterBase::FillFromString(const std::string& key, size_t offset) void InfoStringFromStructConverterBase::FillFromString(const std::string& key, const size_t offset)
{ {
const auto* str = *reinterpret_cast<const char**>(reinterpret_cast<uintptr_t>(m_structure) + offset); const auto* str = *reinterpret_cast<const char**>(reinterpret_cast<uintptr_t>(m_structure) + offset);

4
src/ObjCommon/Utils/InfoString.h
View File

@ -50,7 +50,7 @@ class InfoStringFromStructConverterBase
protected: protected:
InfoString m_info_string; InfoString m_info_string;
const void* m_structure; const void* m_structure;
const std::function<const std::string&(scr_string_t)> m_get_scr_string; const std::function<std::string(scr_string_t)> m_get_scr_string;
void FillFromString(const std::string& key, size_t offset); void FillFromString(const std::string& key, size_t offset);
void FillFromStringBuffer(const std::string& key, size_t offset, size_t bufferSize); void FillFromStringBuffer(const std::string& key, size_t offset, size_t bufferSize);
@ -67,7 +67,7 @@ protected:
public: public:
explicit InfoStringFromStructConverterBase(const void* structure); explicit InfoStringFromStructConverterBase(const void* structure);
InfoStringFromStructConverterBase(const void* structure, std::function<const std::string&(scr_string_t)> scriptStringValueCallback); InfoStringFromStructConverterBase(const void* structure, std::function<std::string(scr_string_t)> scriptStringValueCallback);
virtual ~InfoStringFromStructConverterBase(); virtual ~InfoStringFromStructConverterBase();
InfoStringFromStructConverterBase(const InfoStringFromStructConverterBase& other) = delete; InfoStringFromStructConverterBase(const InfoStringFromStructConverterBase& other) = delete;
InfoStringFromStructConverterBase(InfoStringFromStructConverterBase&& other) noexcept = delete; InfoStringFromStructConverterBase(InfoStringFromStructConverterBase&& other) noexcept = delete;

2
src/ObjWriting/Game/T6/AssetDumpers/AssetDumperWeapon.cpp
View File

@ -1634,7 +1634,7 @@ void AssetDumperWeapon::DumpAsset(Zone* zone, XAssetInfo<WeaponVariantDef>* asse
memset(fullDef, 0, sizeof WeaponFullDef); memset(fullDef, 0, sizeof WeaponFullDef);
CopyToFullDef(asset->Asset(), fullDef); CopyToFullDef(asset->Asset(), fullDef);
InfoStringFromWeaponConverter converter(fullDef, weapon_fields, _countof(weapon_fields), [asset](const scr_string_t scrStr) -> const std::string& InfoStringFromWeaponConverter converter(fullDef, weapon_fields, _countof(weapon_fields), [asset](const scr_string_t scrStr)
{ {
if (scrStr >= asset->m_script_strings.size()) if (scrStr >= asset->m_script_strings.size())
return EMPTY_STRING; return EMPTY_STRING;