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

Also remove string reference in scriptstring callback from WeaponDumper

Browse Source
This commit is contained in:
Jan 2020-10-23 13:35:50 +02:00
parent 2e61f46544
commit f8e7a10789
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,8 +7,6 @@
using namespace T6; using namespace T6;
const std::string AssetDumperWeapon::EMPTY_STRING;
cspField_t AssetDumperWeapon::weapon_fields[] cspField_t AssetDumperWeapon::weapon_fields[]
{ {
{"displayName", offsetof(WeaponFullDef, weapVariantDef.szDisplayName), CSPFT_STRING}, {"displayName", offsetof(WeaponFullDef, weapVariantDef.szDisplayName), CSPFT_STRING},
@ -1494,7 +1492,7 @@ namespace T6
} }
public: public:
InfoStringFromWeaponConverter(const WeaponFullDef* structure, const cspField_t* fields, const size_t fieldCount, std::function<const std::string&(scr_string_t)> scriptStringValueCallback) InfoStringFromWeaponConverter(const WeaponFullDef* structure, const cspField_t* fields, const size_t fieldCount, std::function<std::string(scr_string_t)> scriptStringValueCallback)
: InfoStringFromStructConverter(structure, fields, fieldCount, std::move(scriptStringValueCallback)) : InfoStringFromStructConverter(structure, fields, fieldCount, std::move(scriptStringValueCallback))
{ {
} }
@ -1634,10 +1632,10 @@ 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) InfoStringFromWeaponConverter converter(fullDef, weapon_fields, _countof(weapon_fields), [asset](const scr_string_t scrStr) -> std::string
{ {
if (scrStr >= asset->m_script_strings.size()) if (scrStr >= asset->m_script_strings.size())
return EMPTY_STRING; return "";
return asset->m_script_strings[scrStr]; return asset->m_script_strings[scrStr];
}); });

1
src/ObjWriting/Game/T6/AssetDumpers/AssetDumperWeapon.h
View File

@ -7,7 +7,6 @@ namespace T6
{ {
class AssetDumperWeapon final : public AbstractAssetDumper<WeaponVariantDef> class AssetDumperWeapon final : public AbstractAssetDumper<WeaponVariantDef>
{ {
static const std::string EMPTY_STRING;
static cspField_t weapon_fields[]; static cspField_t weapon_fields[];
void CopyToFullDef(const WeaponVariantDef* weapon, WeaponFullDef* fullDef) const; void CopyToFullDef(const WeaponVariantDef* weapon, WeaponFullDef* fullDef) const;