Rim/iw4x-client
Rim/iw4x-client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

[ImenuDef_t] 2 alignment issues fixed, some menu's still don't work though.

Browse Source
This commit is contained in:
RektInator 2017-03-02 00:20:20 +01:00
parent e8b881ea53
commit 19d122e187
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/Components/Modules/AssetInterfaces/ImenuDef_t.cpp
View File

@ -152,6 +152,7 @@ namespace Assets
case 3: case 3:
if (asset->entries[i].data.operand.internals.function) if (asset->entries[i].data.operand.internals.function)
{ {
buffer->align(Utils::Stream::ALIGN_4);
this->save_Statement_s(asset->entries[i].data.operand.internals.function, builder); this->save_Statement_s(asset->entries[i].data.operand.internals.function, builder);
Utils::Stream::ClearPointer(&destEntries[i].data.operand.internals.function); Utils::Stream::ClearPointer(&destEntries[i].data.operand.internals.function);
} }
@ -252,12 +253,12 @@ namespace Assets
case 6: case 6:
if (asset->eventHandlers[i]->eventData.setLocalVarData) if (asset->eventHandlers[i]->eventData.setLocalVarData)
{ {
buffer->align(Utils::Stream::ALIGN_4);
// header data // header data
Game::SetLocalVarData *destLocalVarData = buffer->dest<Game::SetLocalVarData>(); Game::SetLocalVarData *destLocalVarData = buffer->dest<Game::SetLocalVarData>();
buffer->save(asset->eventHandlers[i]->eventData.setLocalVarData); buffer->save(asset->eventHandlers[i]->eventData.setLocalVarData);
buffer->align(Utils::Stream::ALIGN_4);
// localVarName // localVarName
if (asset->eventHandlers[i]->eventData.setLocalVarData->localVarName) if (asset->eventHandlers[i]->eventData.setLocalVarData->localVarName)
{ {
@ -291,9 +292,6 @@ namespace Assets
while (asset) while (asset)
{ {
// align every indice
buffer->align(Utils::Stream::ALIGN_4);
// Write header // Write header
Game::ItemKeyHandler* dest = buffer->dest<Game::ItemKeyHandler>(); Game::ItemKeyHandler* dest = buffer->dest<Game::ItemKeyHandler>();
buffer->save(asset); buffer->save(asset);
@ -306,6 +304,12 @@ namespace Assets
Utils::Stream::ClearPointer(&dest->action); Utils::Stream::ClearPointer(&dest->action);
} }
if (asset->next)
{
// align every indice, besides the first one?
buffer->align(Utils::Stream::ALIGN_4);
}
// Next key handler // Next key handler
asset = asset->next; asset = asset->next;
} }