zone/OpenAssetTools
zone/OpenAssetTools
2
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2025-04-21 00:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix ZoneCode array loading overwriting pointers when an array is loaded while inside of an array of the same type

Browse Source
This commit is contained in:
Jan 2020-09-09 16:12:20 +02:00
parent 8778421ebb
commit 4aafbac113
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/ZoneCodeGenerator/Generating/Templates/Loading/ArrayPointer.stg
View File

@ -153,11 +153,13 @@ void $LoaderClassName(context.Asset)$::LoadPtrArray_$SafeTypeName(type)$(const b
if(atStreamStart) if(atStreamStart)
m_stream->Load<$type.FullName$*>($TypePtrVarName(type)$, count); m_stream->Load<$type.FullName$*>($TypePtrVarName(type)$, count);
$type.FullName$** var = $TypePtrVarName(type)$;
for(size_t index = 0; index < count; index++) for(size_t index = 0; index < count; index++)
{ {
$TypePtrVarName(type)$ = var;
$LoadPointerArrayMethod_PointerCheck(context, type, structure, reusable)$ $LoadPointerArrayMethod_PointerCheck(context, type, structure, reusable)$
$TypePtrVarName(type)$++; var++;
} }
} }
>> >>

7
src/ZoneCodeGenerator/Generating/Templates/ZoneLoad.stg
View File

@ -236,13 +236,16 @@ void $LoaderClassName(context.Asset)$::LoadArray_$type.Name$(const bool atStream
if(atStreamStart) if(atStreamStart)
m_stream->Load<$type.FullName$>($TypeVarName(type)$, count); m_stream->Load<$type.FullName$>($TypeVarName(type)$, count);
$type.FullName$* var = $TypeVarName(type)$;
for(size_t index = 0; index < count; index++) for(size_t index = 0; index < count; index++)
{ {
$if(!type.Members)$ $if(!type.Members)$
$TypeVarName(structure.Type)$ = $TypeVarName(type)$; $TypeVarName(structure.Type)$ = var;
$else$
$TypeVarName(type)$ = var;
$endif$ $endif$
Load_$structure.Type.Name$(false); Load_$structure.Type.Name$(false);
$TypeVarName(type)$++; var++;
} }
} }
>> >>