From af776b4bc8ac74ea4f8fdea46a549449bbe680dd Mon Sep 17 00:00:00 2001 From: Future Date: Sat, 20 Apr 2024 13:47:17 +0200 Subject: [PATCH] fix missing align --- src/IW4/Assets/FxEffectDef.cpp | 4 +++- src/IW5/Assets/FxEffectDef.cpp | 4 +++- src/IW5/Structs.hpp | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/IW4/Assets/FxEffectDef.cpp b/src/IW4/Assets/FxEffectDef.cpp index 06700b5..85c2d92 100644 --- a/src/IW4/Assets/FxEffectDef.cpp +++ b/src/IW4/Assets/FxEffectDef.cpp @@ -225,6 +225,7 @@ namespace ZoneTool { if (data->markArray) { + buf->align(3); auto destvisuals = buf->write(data->markArray, def->visualCount); for (int i = 0; i < def->visualCount; i++) @@ -242,6 +243,7 @@ namespace ZoneTool } else if (def->visualCount > 1) { + buf->align(3); auto* vis = buf->write(data->array, def->visualCount); for (auto i = 0; i < def->visualCount; i++) @@ -391,7 +393,7 @@ namespace ZoneTool for (auto i = 0; i < elem_def_count; i++) { memcpy(&iw5_fx->elemDefs[i], &asset->elemDefs[i], sizeof IW4::FxElemDef); - iw5_fx->elemDefs[i].pad = 0; + iw5_fx->elemDefs[i].randomSeed = 0; } IW5::IFxEffectDef::dump(iw5_fx); diff --git a/src/IW5/Assets/FxEffectDef.cpp b/src/IW5/Assets/FxEffectDef.cpp index ebf9065..9cd81c5 100644 --- a/src/IW5/Assets/FxEffectDef.cpp +++ b/src/IW5/Assets/FxEffectDef.cpp @@ -291,12 +291,13 @@ namespace ZoneTool void IFxEffectDef::write_fx_elem_def_visuals(IZone* zone, ZoneBuffer* buf, FxElemDef* def, FxElemDefVisuals* dest) { - auto data = dest; + auto* data = dest; if (def->elemType == FX_ELEM_TYPE_DECAL) { if (data->markArray) { + buf->align(3); auto destvisuals = buf->write(data->markArray, def->visualCount); for (int i = 0; i < def->visualCount; i++) @@ -314,6 +315,7 @@ namespace ZoneTool } else if (def->visualCount > 1) { + buf->align(3); auto vis = buf->write(data->array, def->visualCount); for (int i = 0; i < def->visualCount; i++) diff --git a/src/IW5/Structs.hpp b/src/IW5/Structs.hpp index cdca4c4..fddadce 100644 --- a/src/IW5/Structs.hpp +++ b/src/IW5/Structs.hpp @@ -2016,7 +2016,7 @@ namespace ZoneTool char lightingFrac; char useItemClip; char fadeInfo; - int pad; // IW5 only + int randomSeed; // IW5 only Json ToJson() {