From 2e61f46544371e910e8168ce30a9adfc84655b1b Mon Sep 17 00:00:00 2001 From: Jan Date: Fri, 23 Oct 2020 13:26:32 +0200 Subject: [PATCH] Make InfoStringDumper scriptstring callback return std::string instead of const std::string& since a reference is not needed --- src/ObjCommon/Game/T6/InfoStringT6.cpp | 2 +- src/ObjCommon/Game/T6/InfoStringT6.h | 2 +- src/ObjCommon/Utils/InfoString.cpp | 4 ++-- src/ObjCommon/Utils/InfoString.h | 4 ++-- src/ObjWriting/Game/T6/AssetDumpers/AssetDumperWeapon.cpp | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/ObjCommon/Game/T6/InfoStringT6.cpp b/src/ObjCommon/Game/T6/InfoStringT6.cpp index 800a8e31..e8ac4961 100644 --- a/src/ObjCommon/Game/T6/InfoStringT6.cpp +++ b/src/ObjCommon/Game/T6/InfoStringT6.cpp @@ -158,7 +158,7 @@ InfoStringFromStructConverter::InfoStringFromStructConverter(const void* structu } InfoStringFromStructConverter::InfoStringFromStructConverter(const void* structure, const cspField_t* fields, const size_t fieldCount, - std::function scriptStringValueCallback) + std::function scriptStringValueCallback) : InfoStringFromStructConverterBase(structure, std::move(scriptStringValueCallback)), m_fields(fields), m_field_count(fieldCount) diff --git a/src/ObjCommon/Game/T6/InfoStringT6.h b/src/ObjCommon/Game/T6/InfoStringT6.h index f49941ac..fdb4066d 100644 --- a/src/ObjCommon/Game/T6/InfoStringT6.h +++ b/src/ObjCommon/Game/T6/InfoStringT6.h @@ -28,6 +28,6 @@ namespace T6 public: InfoStringFromStructConverter(const void* structure, const cspField_t* fields, size_t fieldCount); - InfoStringFromStructConverter(const void* structure, const cspField_t* fields, size_t fieldCount, std::function scriptStringValueCallback); + InfoStringFromStructConverter(const void* structure, const cspField_t* fields, size_t fieldCount, std::function scriptStringValueCallback); }; } diff --git a/src/ObjCommon/Utils/InfoString.cpp b/src/ObjCommon/Utils/InfoString.cpp index 4b340158..45f3a114 100644 --- a/src/ObjCommon/Utils/InfoString.cpp +++ b/src/ObjCommon/Utils/InfoString.cpp @@ -117,7 +117,7 @@ InfoStringFromStructConverterBase::InfoStringFromStructConverterBase(const void* { } -InfoStringFromStructConverterBase::InfoStringFromStructConverterBase(const void* structure, std::function scriptStringValueCallback) +InfoStringFromStructConverterBase::InfoStringFromStructConverterBase(const void* structure, std::function scriptStringValueCallback) : m_structure(structure), m_get_scr_string(std::move(scriptStringValueCallback)) { @@ -132,7 +132,7 @@ InfoString InfoStringFromStructConverterBase::Convert() 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(reinterpret_cast(m_structure) + offset); diff --git a/src/ObjCommon/Utils/InfoString.h b/src/ObjCommon/Utils/InfoString.h index 506354f1..f638cee6 100644 --- a/src/ObjCommon/Utils/InfoString.h +++ b/src/ObjCommon/Utils/InfoString.h @@ -50,7 +50,7 @@ class InfoStringFromStructConverterBase protected: InfoString m_info_string; const void* m_structure; - const std::function m_get_scr_string; + const std::function m_get_scr_string; void FillFromString(const std::string& key, size_t offset); void FillFromStringBuffer(const std::string& key, size_t offset, size_t bufferSize); @@ -67,7 +67,7 @@ protected: public: explicit InfoStringFromStructConverterBase(const void* structure); - InfoStringFromStructConverterBase(const void* structure, std::function scriptStringValueCallback); + InfoStringFromStructConverterBase(const void* structure, std::function scriptStringValueCallback); virtual ~InfoStringFromStructConverterBase(); InfoStringFromStructConverterBase(const InfoStringFromStructConverterBase& other) = delete; InfoStringFromStructConverterBase(InfoStringFromStructConverterBase&& other) noexcept = delete; diff --git a/src/ObjWriting/Game/T6/AssetDumpers/AssetDumperWeapon.cpp b/src/ObjWriting/Game/T6/AssetDumpers/AssetDumperWeapon.cpp index 816b37a2..8b39076b 100644 --- a/src/ObjWriting/Game/T6/AssetDumpers/AssetDumperWeapon.cpp +++ b/src/ObjWriting/Game/T6/AssetDumpers/AssetDumperWeapon.cpp @@ -1634,7 +1634,7 @@ void AssetDumperWeapon::DumpAsset(Zone* zone, XAssetInfo* asse memset(fullDef, 0, sizeof WeaponFullDef); 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()) return EMPTY_STRING;