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

Add scriptstring value callback to weapon loading of t6

Browse Source
This commit is contained in:
Jan
2020-10-23 12:52:44 +02:00
parent 068add0eef
commit 6cca45fc26
6 changed files with 61 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -117,9 +117,7 @@ InfoStringFromStructConverterBase::InfoStringFromStructConverterBase(const void*
{
}
InfoStringFromStructConverterBase::InfoStringFromStructConverterBase(const void* structure,
std::function<std::string(scr_string_t)>
scriptStringValueCallback)
InfoStringFromStructConverterBase::InfoStringFromStructConverterBase(const void* structure, std::function<const std::string&(scr_string_t)> scriptStringValueCallback)
: m_structure(structure),
m_get_scr_string(std::move(scriptStringValueCallback))
{

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

@ -50,7 +50,7 @@ class InfoStringFromStructConverterBase
protected:
InfoString m_info_string;
const void* m_structure;
const std::function<std::string(scr_string_t)> m_get_scr_string;
const std::function<const std::string&(scr_string_t)> 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<std::string(scr_string_t)> scriptStringValueCallback);
InfoStringFromStructConverterBase(const void* structure, std::function<const std::string&(scr_string_t)> scriptStringValueCallback);
virtual ~InfoStringFromStructConverterBase();
InfoStringFromStructConverterBase(const InfoStringFromStructConverterBase& other) = delete;
InfoStringFromStructConverterBase(InfoStringFromStructConverterBase&& other) noexcept = delete;