zone/OpenAssetTools
2
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2025-09-02 15:07:26 +00:00
Code Activity

Merge pull request #171 from diamante0018/fix/stringtable-dumping

Browse Source 
fix: check for NULL string in stringtable check before dumping
This commit is contained in:
Jan
2024-04-21 20:06:43 +02:00
committed by GitHub
parent 83f57e1961 c34eab16ea
commit ec22d2a01f
4 changed files with 32 additions and 4 deletions
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();
} }