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

[ImenuDef_t] Added sub save_ functions to ImenuDef_t interface

Browse Source
This commit is contained in:
RektInator 2017-02-26 14:54:19 +01:00
parent 23e1127e08
commit 643a3a36d5
2 changed files with 52 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -32,31 +32,7 @@ namespace Assets
} }
} }
template <typename T> void ImenuDef_t::save_ExpressionSupportingData(Game::ExpressionSupportingData* asset, Components::ZoneBuilder::Zone* builder)
void save_windowDef_t(Game::windowDef_t* asset, T* dest, Components::ZoneBuilder::Zone* builder)
{
Utils::Stream* buffer = builder->getBuffer();
if (asset->name)
{
buffer->saveString(asset->name);
Utils::Stream::ClearPointer(&dest->window.name);
}
if (asset->group)
{
buffer->saveString(asset->group);
Utils::Stream::ClearPointer(&dest->window.group);
}
if (asset->background)
{
dest->window.background = builder->saveSubAsset(Game::XAssetType::ASSET_TYPE_MATERIAL, asset->background).material;
}
}
void save_Statement_s(Game::Statement_s* asset, Components::ZoneBuilder::Zone* builder);
void save_ExpressionSupportingData(Game::ExpressionSupportingData* asset, Components::ZoneBuilder::Zone* builder)
{ {
AssertSize(Game::ExpressionSupportingData, 24); AssertSize(Game::ExpressionSupportingData, 24);
Utils::Stream* buffer = builder->getBuffer(); Utils::Stream* buffer = builder->getBuffer();
@ -80,7 +56,7 @@ namespace Assets
Utils::Stream::ClearPointer(&destStatement[i]); Utils::Stream::ClearPointer(&destStatement[i]);
buffer->align(Utils::Stream::ALIGN_4); buffer->align(Utils::Stream::ALIGN_4);
save_Statement_s(asset->uifunctions.functions[i], builder); this->save_Statement_s(asset->uifunctions.functions[i], builder);
} }
} }
@ -133,7 +109,7 @@ namespace Assets
} }
} }
void save_Statement_s(Game::Statement_s* asset, Components::ZoneBuilder::Zone* builder) void ImenuDef_t::save_Statement_s(Game::Statement_s* asset, Components::ZoneBuilder::Zone* builder)
{ {
AssertSize(Game::Statement_s, 24); AssertSize(Game::Statement_s, 24);
Utils::Stream* buffer = builder->getBuffer(); Utils::Stream* buffer = builder->getBuffer();
@ -176,7 +152,7 @@ namespace Assets
case 3: case 3:
if (asset->entries[i].data.operand.internals.function) if (asset->entries[i].data.operand.internals.function)
{ {
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);
} }
break; break;
@ -186,12 +162,12 @@ namespace Assets
} }
if (asset->supportingData) if (asset->supportingData)
{ {
save_ExpressionSupportingData(asset->supportingData, builder); this->save_ExpressionSupportingData(asset->supportingData, builder);
Utils::Stream::ClearPointer(&dest->supportingData); Utils::Stream::ClearPointer(&dest->supportingData);
} }
} }
void save_MenuEventHandlerSet(Game::MenuEventHandlerSet* asset, Components::ZoneBuilder::Zone* builder) void ImenuDef_t::save_MenuEventHandlerSet(Game::MenuEventHandlerSet* asset, Components::ZoneBuilder::Zone* builder)
{ {
AssertSize(Game::MenuEventHandlerSet, 8); AssertSize(Game::MenuEventHandlerSet, 8);
Utils::Stream* buffer = builder->getBuffer(); Utils::Stream* buffer = builder->getBuffer();
@ -243,7 +219,7 @@ namespace Assets
if (asset->eventHandlers[i]->eventData.conditionalScript->eventExpression) if (asset->eventHandlers[i]->eventData.conditionalScript->eventExpression)
{ {
buffer->align(Utils::Stream::ALIGN_4); buffer->align(Utils::Stream::ALIGN_4);
save_Statement_s(asset->eventHandlers[i]->eventData.conditionalScript->eventExpression, builder); this->save_Statement_s(asset->eventHandlers[i]->eventData.conditionalScript->eventExpression, builder);
Utils::Stream::ClearPointer(&destConditionalScript->eventExpression); Utils::Stream::ClearPointer(&destConditionalScript->eventExpression);
} }
@ -251,7 +227,7 @@ namespace Assets
if (asset->eventHandlers[i]->eventData.conditionalScript->eventHandlerSet) if (asset->eventHandlers[i]->eventData.conditionalScript->eventHandlerSet)
{ {
buffer->align(Utils::Stream::ALIGN_4); buffer->align(Utils::Stream::ALIGN_4);
save_MenuEventHandlerSet(asset->eventHandlers[i]->eventData.conditionalScript->eventHandlerSet, builder); this->save_MenuEventHandlerSet(asset->eventHandlers[i]->eventData.conditionalScript->eventHandlerSet, builder);
Utils::Stream::ClearPointer(&destConditionalScript->eventHandlerSet); Utils::Stream::ClearPointer(&destConditionalScript->eventHandlerSet);
} }
@ -264,7 +240,7 @@ namespace Assets
if (asset->eventHandlers[i]->eventData.elseScript) if (asset->eventHandlers[i]->eventData.elseScript)
{ {
buffer->align(Utils::Stream::ALIGN_4); buffer->align(Utils::Stream::ALIGN_4);
save_MenuEventHandlerSet(asset->eventHandlers[i]->eventData.elseScript, builder); this->save_MenuEventHandlerSet(asset->eventHandlers[i]->eventData.elseScript, builder);
Utils::Stream::ClearPointer(&dest->eventData.elseScript); Utils::Stream::ClearPointer(&dest->eventData.elseScript);
} }
break; break;
@ -293,7 +269,7 @@ namespace Assets
if (asset->eventHandlers[i]->eventData.setLocalVarData->expression) if (asset->eventHandlers[i]->eventData.setLocalVarData->expression)
{ {
buffer->align(Utils::Stream::ALIGN_4); buffer->align(Utils::Stream::ALIGN_4);
save_Statement_s(asset->eventHandlers[i]->eventData.setLocalVarData->expression, builder); this->save_Statement_s(asset->eventHandlers[i]->eventData.setLocalVarData->expression, builder);
Utils::Stream::ClearPointer(&destLocalVarData->expression); Utils::Stream::ClearPointer(&destLocalVarData->expression);
} }
@ -308,7 +284,7 @@ namespace Assets
} }
} }
void save_ItemKeyHandler(Game::ItemKeyHandler* asset, Components::ZoneBuilder::Zone* builder) void ImenuDef_t::save_ItemKeyHandler(Game::ItemKeyHandler* asset, Components::ZoneBuilder::Zone* builder)
{ {
AssertSize(Game::ItemKeyHandler, 12); AssertSize(Game::ItemKeyHandler, 12);
Utils::Stream* buffer = builder->getBuffer(); Utils::Stream* buffer = builder->getBuffer();
@ -326,7 +302,7 @@ namespace Assets
if (asset->action) if (asset->action)
{ {
buffer->align(Utils::Stream::ALIGN_4); buffer->align(Utils::Stream::ALIGN_4);
save_MenuEventHandlerSet(asset->action, builder); this->save_MenuEventHandlerSet(asset->action, builder);
Utils::Stream::ClearPointer(&dest->action); Utils::Stream::ClearPointer(&dest->action);
} }
@ -339,7 +315,7 @@ namespace Assets
if (asset->__indice) \ if (asset->__indice) \
{ \ { \
buffer->align(Utils::Stream::ALIGN_4); \ buffer->align(Utils::Stream::ALIGN_4); \
save_MenuEventHandlerSet(asset->__indice, builder); \ this->save_MenuEventHandlerSet(asset->__indice, builder); \
Utils::Stream::ClearPointer(&dest->__indice); \ Utils::Stream::ClearPointer(&dest->__indice); \
} }
@ -347,11 +323,11 @@ namespace Assets
if (asset->__indice) \ if (asset->__indice) \
{ \ { \
buffer->align(Utils::Stream::ALIGN_4); \ buffer->align(Utils::Stream::ALIGN_4); \
save_Statement_s(asset->__indice, builder); \ this->save_Statement_s(asset->__indice, builder); \
Utils::Stream::ClearPointer(&dest->__indice); \ Utils::Stream::ClearPointer(&dest->__indice); \
} }
void save_itemDefData_t(Game::itemDefData_t* asset, int type, Game::itemDef_t* dest, Components::ZoneBuilder::Zone* builder) void ImenuDef_t::save_itemDefData_t(Game::itemDefData_t* asset, int type, Game::itemDef_t* dest, Components::ZoneBuilder::Zone* builder)
{ {
AssertSize(Game::newsTickerDef_s, 28); AssertSize(Game::newsTickerDef_s, 28);
AssertSize(Game::listBoxDef_s, 324); AssertSize(Game::listBoxDef_s, 324);
@ -370,7 +346,7 @@ namespace Assets
if (asset->listBox->doubleClick) if (asset->listBox->doubleClick)
{ {
buffer->align(Utils::Stream::ALIGN_4); buffer->align(Utils::Stream::ALIGN_4);
save_MenuEventHandlerSet(asset->listBox->doubleClick, builder); this->save_MenuEventHandlerSet(asset->listBox->doubleClick, builder);
} }
if (asset->listBox->selectIcon) if (asset->listBox->selectIcon)
@ -443,7 +419,7 @@ namespace Assets
Utils::Stream::ClearPointer(&dest->typeData.data); Utils::Stream::ClearPointer(&dest->typeData.data);
} }
void save_itemDef_t(Game::itemDef_t *asset, Components::ZoneBuilder::Zone* builder) void ImenuDef_t::save_itemDef_t(Game::itemDef_t *asset, Components::ZoneBuilder::Zone* builder)
{ {
AssertSize(Game::itemDef_t, 380); AssertSize(Game::itemDef_t, 380);
@ -488,7 +464,7 @@ namespace Assets
if (asset->onKey) if (asset->onKey)
{ {
buffer->align(Utils::Stream::ALIGN_4); buffer->align(Utils::Stream::ALIGN_4);
save_ItemKeyHandler(asset->onKey, builder); this->save_ItemKeyHandler(asset->onKey, builder);
Utils::Stream::ClearPointer(&dest->onKey); Utils::Stream::ClearPointer(&dest->onKey);
} }
@ -513,7 +489,7 @@ namespace Assets
// itemDefData // itemDefData
if (asset->typeData.data) if (asset->typeData.data)
{ {
save_itemDefData_t(&asset->typeData, asset->type, dest, builder); this->save_itemDefData_t(&asset->typeData, asset->type, dest, builder);
} }
// floatExpressions // floatExpressions
@ -527,7 +503,7 @@ namespace Assets
for (int i = 0; i < asset->floatExpressionCount; i++) for (int i = 0; i < asset->floatExpressionCount; i++)
{ {
buffer->align(Utils::Stream::ALIGN_4); buffer->align(Utils::Stream::ALIGN_4);
save_Statement_s(asset->floatExpressions[i].expression, builder); this->save_Statement_s(asset->floatExpressions[i].expression, builder);
Utils::Stream::ClearPointer(&destExp->expression); Utils::Stream::ClearPointer(&destExp->expression);
} }
@ -557,7 +533,7 @@ namespace Assets
if (asset->expressionData) if (asset->expressionData)
{ {
// dest->expressionData = nullptr; // dest->expressionData = nullptr;
save_ExpressionSupportingData(asset->expressionData, builder); this->save_ExpressionSupportingData(asset->expressionData, builder);
Utils::Stream::ClearPointer(&dest->expressionData); Utils::Stream::ClearPointer(&dest->expressionData);
} }
@ -581,7 +557,7 @@ namespace Assets
if (asset->onKey) if (asset->onKey)
{ {
buffer->align(Utils::Stream::ALIGN_4); buffer->align(Utils::Stream::ALIGN_4);
save_ItemKeyHandler(asset->onKey, builder); this->save_ItemKeyHandler(asset->onKey, builder);
Utils::Stream::ClearPointer(&dest->onKey); Utils::Stream::ClearPointer(&dest->onKey);
} }
@ -619,7 +595,7 @@ namespace Assets
if (asset->items[i]) if (asset->items[i])
{ {
buffer->align(Utils::Stream::ALIGN_4); buffer->align(Utils::Stream::ALIGN_4);
save_itemDef_t(asset->items[i], builder); this->save_itemDef_t(asset->items[i], builder);
} }
} }
} }

29
src/Components/Modules/AssetInterfaces/ImenuDef_t.hpp
View File

@ -10,5 +10,34 @@ namespace Assets
virtual void save(Game::XAssetHeader header, Components::ZoneBuilder::Zone* builder) override; virtual void save(Game::XAssetHeader header, Components::ZoneBuilder::Zone* builder) override;
virtual void mark(Game::XAssetHeader header, Components::ZoneBuilder::Zone* builder) override; virtual void mark(Game::XAssetHeader header, Components::ZoneBuilder::Zone* builder) override;
// virtual void load(Game::XAssetHeader* header, std::string name, Components::ZoneBuilder::Zone* builder) override; // virtual void load(Game::XAssetHeader* header, std::string name, Components::ZoneBuilder::Zone* builder) override;
private:
template <typename T> void save_windowDef_t(Game::windowDef_t* asset, T* dest, Components::ZoneBuilder::Zone* builder)
{
Utils::Stream* buffer = builder->getBuffer();
if (asset->name)
{
buffer->saveString(asset->name);
Utils::Stream::ClearPointer(&dest->window.name);
}
if (asset->group)
{
buffer->saveString(asset->group);
Utils::Stream::ClearPointer(&dest->window.group);
}
if (asset->background)
{
dest->window.background = builder->saveSubAsset(Game::XAssetType::ASSET_TYPE_MATERIAL, asset->background).material;
}
}
void save_ExpressionSupportingData(Game::ExpressionSupportingData* asset, Components::ZoneBuilder::Zone* builder);
void save_Statement_s(Game::Statement_s* asset, Components::ZoneBuilder::Zone* builder);
void save_MenuEventHandlerSet(Game::MenuEventHandlerSet* asset, Components::ZoneBuilder::Zone* builder);
void save_ItemKeyHandler(Game::ItemKeyHandler* asset, Components::ZoneBuilder::Zone* builder);
void save_itemDefData_t(Game::itemDefData_t* asset, int type, Game::itemDef_t* dest, Components::ZoneBuilder::Zone* builder);
void save_itemDef_t(Game::itemDef_t *asset, Components::ZoneBuilder::Zone* builder);
}; };
} }