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

fix: check for NULL string in stringtable check before dumping

Browse Source
This commit is contained in:
6arelyFuture 2024-04-21 17:29:15 +02:00
parent 83f57e1961
commit c34eab16ea
Signed by: Future
GPG Key ID: FA77F074E98D98A5
4 changed files with 32 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/ObjWriting/Game/IW4/AssetDumpers/AssetDumperStringTable.cpp
View File

@ -24,8 +24,15 @@ void AssetDumperStringTable::DumpAsset(AssetDumpingContext& context, XAssetInfo<
for (auto column = 0; column < stringTable->columnCount; column++) for (auto column = 0; column < stringTable->columnCount; column++)
{ {
const auto* cell = &stringTable->values[column + row * stringTable->columnCount]; const auto* cell = &stringTable->values[column + row * stringTable->columnCount];
if (cell->string != nullptr)
{
csv.WriteColumn(cell->string); csv.WriteColumn(cell->string);
} }
else
{
csv.WriteColumn("");
}
}
csv.NextRow(); csv.NextRow();
} }

7
src/ObjWriting/Game/IW5/AssetDumpers/AssetDumperStringTable.cpp
View File

@ -24,8 +24,15 @@ void AssetDumperStringTable::DumpAsset(AssetDumpingContext& context, XAssetInfo<
for (auto column = 0; column < stringTable->columnCount; column++) for (auto column = 0; column < stringTable->columnCount; column++)
{ {
const auto* cell = &stringTable->values[column + row * stringTable->columnCount]; const auto* cell = &stringTable->values[column + row * stringTable->columnCount];
if (cell->string != nullptr)
{
csv.WriteColumn(cell->string); csv.WriteColumn(cell->string);
} }
else
{
csv.WriteColumn("");
}
}
csv.NextRow(); csv.NextRow();
} }

7
src/ObjWriting/Game/T5/AssetDumpers/AssetDumperStringTable.cpp
View File

@ -24,8 +24,15 @@ void AssetDumperStringTable::DumpAsset(AssetDumpingContext& context, XAssetInfo<
for (auto column = 0; column < stringTable->columnCount; column++) for (auto column = 0; column < stringTable->columnCount; column++)
{ {
const auto* cell = &stringTable->values[column + row * stringTable->columnCount]; const auto* cell = &stringTable->values[column + row * stringTable->columnCount];
if (cell->string != nullptr)
{
csv.WriteColumn(cell->string); csv.WriteColumn(cell->string);
} }
else
{
csv.WriteColumn("");
}
}
csv.NextRow(); csv.NextRow();
} }

7
src/ObjWriting/Game/T6/AssetDumpers/AssetDumperStringTable.cpp
View File

@ -24,8 +24,15 @@ void AssetDumperStringTable::DumpAsset(AssetDumpingContext& context, XAssetInfo<
for (auto column = 0; column < stringTable->columnCount; column++) for (auto column = 0; column < stringTable->columnCount; column++)
{ {
const auto* cell = &stringTable->values[column + row * stringTable->columnCount]; const auto* cell = &stringTable->values[column + row * stringTable->columnCount];
if (cell->string != nullptr)
{
csv.WriteColumn(cell->string); csv.WriteColumn(cell->string);
} }
else
{
csv.WriteColumn("");
}
}
csv.NextRow(); csv.NextRow();
} }