From 5c0e6f24396b893325ab2fcbb55bdf77895f9968 Mon Sep 17 00:00:00 2001 From: Sevenfm Date: Sat, 8 May 2021 15:45:23 +0000 Subject: [PATCH] Fix: incorrect initialization (by serg). git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9012 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Tactical/XML_Drugs.cpp | 4 +++- Tactical/XML_MilitiaIndividual.cpp | 7 ++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Tactical/XML_Drugs.cpp b/Tactical/XML_Drugs.cpp index 71fb92f18..c70113158 100644 --- a/Tactical/XML_Drugs.cpp +++ b/Tactical/XML_Drugs.cpp @@ -39,7 +39,9 @@ drugsStartElementHandle(void *userData, const XML_Char *name, const XML_Char **a { pData->curElement = ELEMENT_LIST; - memset(pData->curArray,0,sizeof(DRUG)*pData->maxArraySize); + for (UINT32 i = 0; i < pData->maxArraySize; ++i) { + pData->curArray[i] = DRUG{}; + } pData->maxReadDepth++; //we are not skipping this element } diff --git a/Tactical/XML_MilitiaIndividual.cpp b/Tactical/XML_MilitiaIndividual.cpp index 7b4a68d8f..877762a31 100644 --- a/Tactical/XML_MilitiaIndividual.cpp +++ b/Tactical/XML_MilitiaIndividual.cpp @@ -42,8 +42,9 @@ militiaindividualStartElementHandle( void *userData, const XML_Char *name, const { pData->curElement = ELEMENT_LIST; - if ( !localizedTextOnly_MI ) - memset( pData->curArray, 0, sizeof(MilitiaOriginData)*pData->maxArraySize ); + for (UINT32 i = 0; i < pData->maxArraySize; ++i) { + pData->curArray[i] = MilitiaOriginData{}; + } pData->maxReadDepth++; //we are not skipping this element } @@ -52,7 +53,7 @@ militiaindividualStartElementHandle( void *userData, const XML_Char *name, const pData->curElement = ELEMENT; if ( !localizedTextOnly_MI ) - memset( &pData->curBackground, 0, sizeof(MilitiaOriginData) ); + pData->curBackground = MilitiaOriginData{}; pData->maxReadDepth++; //we are not skipping this element }