zone/zonetool
zone/zonetool
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

fix missing align

Browse Source
This commit is contained in:
6arelyFuture 2024-04-20 13:47:17 +02:00
parent f51edcb138
commit af776b4bc8
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/IW4/Assets/FxEffectDef.cpp
View File

@ -225,6 +225,7 @@ namespace ZoneTool
{ {
if (data->markArray) if (data->markArray)
{ {
buf->align(3);
auto destvisuals = buf->write(data->markArray, def->visualCount); auto destvisuals = buf->write(data->markArray, def->visualCount);
for (int i = 0; i < def->visualCount; i++) for (int i = 0; i < def->visualCount; i++)
@ -242,6 +243,7 @@ namespace ZoneTool
} }
else if (def->visualCount > 1) else if (def->visualCount > 1)
{ {
buf->align(3);
auto* vis = buf->write(data->array, def->visualCount); auto* vis = buf->write(data->array, def->visualCount);
for (auto i = 0; i < def->visualCount; i++) for (auto i = 0; i < def->visualCount; i++)
@ -391,7 +393,7 @@ namespace ZoneTool
for (auto i = 0; i < elem_def_count; i++) for (auto i = 0; i < elem_def_count; i++)
{ {
memcpy(&iw5_fx->elemDefs[i], &asset->elemDefs[i], sizeof IW4::FxElemDef); 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); IW5::IFxEffectDef::dump(iw5_fx);

4
src/IW5/Assets/FxEffectDef.cpp
View File

@ -291,12 +291,13 @@ namespace ZoneTool
void IFxEffectDef::write_fx_elem_def_visuals(IZone* zone, ZoneBuffer* buf, FxElemDef* def, void IFxEffectDef::write_fx_elem_def_visuals(IZone* zone, ZoneBuffer* buf, FxElemDef* def,
FxElemDefVisuals* dest) FxElemDefVisuals* dest)
{ {
auto data = dest; auto* data = dest;
if (def->elemType == FX_ELEM_TYPE_DECAL) if (def->elemType == FX_ELEM_TYPE_DECAL)
{ {
if (data->markArray) if (data->markArray)
{ {
buf->align(3);
auto destvisuals = buf->write(data->markArray, def->visualCount); auto destvisuals = buf->write(data->markArray, def->visualCount);
for (int i = 0; i < def->visualCount; i++) for (int i = 0; i < def->visualCount; i++)
@ -314,6 +315,7 @@ namespace ZoneTool
} }
else if (def->visualCount > 1) else if (def->visualCount > 1)
{ {
buf->align(3);
auto vis = buf->write(data->array, def->visualCount); auto vis = buf->write(data->array, def->visualCount);
for (int i = 0; i < def->visualCount; i++) for (int i = 0; i < def->visualCount; i++)

2
src/IW5/Structs.hpp
View File

@ -2016,7 +2016,7 @@ namespace ZoneTool
char lightingFrac; char lightingFrac;
char useItemClip; char useItemClip;
char fadeInfo; char fadeInfo;
int pad; // IW5 only int randomSeed; // IW5 only
Json ToJson() Json ToJson()
{ {