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

Remove reference asset names from info strings

Browse Source
This commit is contained in:
Jan 2021-03-06 21:20:13 +01:00
parent 78107b74e0
commit 313e9e9f1a
5 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/ObjCommon/Game/IW4/InfoStringIW4.cpp
View File

@ -68,7 +68,7 @@ void InfoStringFromStructConverter::FillFromBaseField(const cspField_t& field)
const auto* fx = *reinterpret_cast<FxEffectDef**>(reinterpret_cast<uintptr_t>(m_structure) + field.iOffset); const auto* fx = *reinterpret_cast<FxEffectDef**>(reinterpret_cast<uintptr_t>(m_structure) + field.iOffset);
if (fx) if (fx)
m_info_string.SetValueForKey(std::string(field.szName), std::string(fx->name)); m_info_string.SetValueForKey(std::string(field.szName), std::string(AssetName(fx->name)));
else else
m_info_string.SetValueForKey(std::string(field.szName), ""); m_info_string.SetValueForKey(std::string(field.szName), "");
break; break;
@ -79,7 +79,7 @@ void InfoStringFromStructConverter::FillFromBaseField(const cspField_t& field)
const auto* model = *reinterpret_cast<XModel**>(reinterpret_cast<uintptr_t>(m_structure) + field.iOffset); const auto* model = *reinterpret_cast<XModel**>(reinterpret_cast<uintptr_t>(m_structure) + field.iOffset);
if (model) if (model)
m_info_string.SetValueForKey(std::string(field.szName), std::string(model->name)); m_info_string.SetValueForKey(std::string(field.szName), std::string(AssetName(model->name)));
else else
m_info_string.SetValueForKey(std::string(field.szName), ""); m_info_string.SetValueForKey(std::string(field.szName), "");
break; break;
@ -91,7 +91,7 @@ void InfoStringFromStructConverter::FillFromBaseField(const cspField_t& field)
iOffset); iOffset);
if (material) if (material)
m_info_string.SetValueForKey(std::string(field.szName), std::string(material->info.name)); m_info_string.SetValueForKey(std::string(field.szName), std::string(AssetName(material->info.name)));
else else
m_info_string.SetValueForKey(std::string(field.szName), ""); m_info_string.SetValueForKey(std::string(field.szName), "");
break; break;
@ -103,7 +103,7 @@ void InfoStringFromStructConverter::FillFromBaseField(const cspField_t& field)
iOffset); iOffset);
if (physCollMap) if (physCollMap)
m_info_string.SetValueForKey(std::string(field.szName), std::string(physCollMap->name)); m_info_string.SetValueForKey(std::string(field.szName), std::string(AssetName(physCollMap->name)));
else else
m_info_string.SetValueForKey(std::string(field.szName), ""); m_info_string.SetValueForKey(std::string(field.szName), "");
break; break;
@ -127,7 +127,7 @@ void InfoStringFromStructConverter::FillFromBaseField(const cspField_t& field)
iOffset); iOffset);
if (tracer) if (tracer)
m_info_string.SetValueForKey(std::string(field.szName), std::string(tracer->name)); m_info_string.SetValueForKey(std::string(field.szName), std::string(AssetName(tracer->name)));
else else
m_info_string.SetValueForKey(std::string(field.szName), ""); m_info_string.SetValueForKey(std::string(field.szName), "");
break; break;

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

@ -65,7 +65,7 @@ void InfoStringFromStructConverter::FillFromBaseField(const cspField_t& field)
const auto* fx = *reinterpret_cast<FxEffectDef**>(reinterpret_cast<uintptr_t>(m_structure) + field.iOffset); const auto* fx = *reinterpret_cast<FxEffectDef**>(reinterpret_cast<uintptr_t>(m_structure) + field.iOffset);
if (fx) if (fx)
m_info_string.SetValueForKey(std::string(field.szName), std::string(fx->name)); m_info_string.SetValueForKey(std::string(field.szName), std::string(AssetName(fx->name)));
else else
m_info_string.SetValueForKey(std::string(field.szName), ""); m_info_string.SetValueForKey(std::string(field.szName), "");
break; break;
@ -76,7 +76,7 @@ void InfoStringFromStructConverter::FillFromBaseField(const cspField_t& field)
const auto* model = *reinterpret_cast<XModel**>(reinterpret_cast<uintptr_t>(m_structure) + field.iOffset); const auto* model = *reinterpret_cast<XModel**>(reinterpret_cast<uintptr_t>(m_structure) + field.iOffset);
if (model) if (model)
m_info_string.SetValueForKey(std::string(field.szName), std::string(model->name)); m_info_string.SetValueForKey(std::string(field.szName), std::string(AssetName(model->name)));
else else
m_info_string.SetValueForKey(std::string(field.szName), ""); m_info_string.SetValueForKey(std::string(field.szName), "");
break; break;
@ -89,7 +89,7 @@ void InfoStringFromStructConverter::FillFromBaseField(const cspField_t& field)
iOffset); iOffset);
if (material) if (material)
m_info_string.SetValueForKey(std::string(field.szName), std::string(material->info.name)); m_info_string.SetValueForKey(std::string(field.szName), std::string(AssetName(material->info.name)));
else else
m_info_string.SetValueForKey(std::string(field.szName), ""); m_info_string.SetValueForKey(std::string(field.szName), "");
break; break;
@ -101,7 +101,7 @@ void InfoStringFromStructConverter::FillFromBaseField(const cspField_t& field)
iOffset); iOffset);
if (physPreset) if (physPreset)
m_info_string.SetValueForKey(std::string(field.szName), std::string(physPreset->name)); m_info_string.SetValueForKey(std::string(field.szName), std::string(AssetName(physPreset->name)));
else else
m_info_string.SetValueForKey(std::string(field.szName), ""); m_info_string.SetValueForKey(std::string(field.szName), "");
break; break;
@ -116,7 +116,7 @@ void InfoStringFromStructConverter::FillFromBaseField(const cspField_t& field)
const auto* tracer = *reinterpret_cast<TracerDef**>(reinterpret_cast<uintptr_t>(m_structure) + field.iOffset); const auto* tracer = *reinterpret_cast<TracerDef**>(reinterpret_cast<uintptr_t>(m_structure) + field.iOffset);
if (tracer) if (tracer)
m_info_string.SetValueForKey(std::string(field.szName), std::string(tracer->name)); m_info_string.SetValueForKey(std::string(field.szName), std::string(AssetName(tracer->name)));
else else
m_info_string.SetValueForKey(std::string(field.szName), ""); m_info_string.SetValueForKey(std::string(field.szName), "");
break; break;

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

@ -144,6 +144,14 @@ InfoString InfoStringFromStructConverterBase::Convert()
return std::move(m_info_string); return std::move(m_info_string);
} }
const char* InfoStringFromStructConverterBase::AssetName(const char* name)
{
if (name && name[0] == ',')
return &name[1];
return name;
}
void InfoStringFromStructConverterBase::FillFromString(const std::string& key, const 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);

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

@ -54,6 +54,7 @@ protected:
const void* m_structure; const void* m_structure;
const std::function<std::string(scr_string_t)> m_get_scr_string; const std::function<std::string(scr_string_t)> m_get_scr_string;
static const char* AssetName(const char* name);
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);
void FillFromInt(const std::string& key, size_t offset); void FillFromInt(const std::string& key, size_t offset);

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

@ -1481,7 +1481,7 @@ namespace T6
.iOffset); .iOffset);
if (camo) if (camo)
m_info_string.SetValueForKey(std::string(field.szName), std::string(camo->name)); m_info_string.SetValueForKey(std::string(field.szName), std::string(AssetName(camo->name)));
else else
m_info_string.SetValueForKey(std::string(field.szName), ""); m_info_string.SetValueForKey(std::string(field.szName), "");
break; break;