From edd906170b993a800c70273293083ffa51656735 Mon Sep 17 00:00:00 2001 From: RektInator Date: Sun, 26 Feb 2017 11:36:58 +0100 Subject: [PATCH] [ImenuDef_t] itemDefData is now functional for most item types. multiDef_s is todo. --- src/Components/Modules/AssetInterfaces/ImenuDef_t.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/Components/Modules/AssetInterfaces/ImenuDef_t.cpp b/src/Components/Modules/AssetInterfaces/ImenuDef_t.cpp index 29f64ace..1aaf9a57 100644 --- a/src/Components/Modules/AssetInterfaces/ImenuDef_t.cpp +++ b/src/Components/Modules/AssetInterfaces/ImenuDef_t.cpp @@ -347,6 +347,10 @@ namespace Assets void save_itemDefData_t(Game::itemDefData_t* asset, int type, Game::itemDef_t* dest, Components::ZoneBuilder::Zone* builder) { + AssertSize(Game::newsTickerDef_s, 28); + AssertSize(Game::listBoxDef_s, 324); + AssertSize(Game::editFieldDef_s, 32); + Utils::Stream* buffer = builder->getBuffer(); // feeder @@ -406,7 +410,7 @@ namespace Assets else { buffer->align(Utils::Stream::ALIGN_4); - buffer->save(asset->multiDef); + buffer->save(asset->editField); } Utils::Stream::ClearPointer(&dest->typeData.data); @@ -482,8 +486,7 @@ namespace Assets // itemDefData if (asset->typeData.data) { - // save_itemDefData_t(&asset->typeData, asset->type, dest, builder); - dest->typeData.data = nullptr; + save_itemDefData_t(&asset->typeData, asset->type, dest, builder); } // floatExpressions