diff --git a/Strategic/MilitiaIndividual.cpp b/Strategic/MilitiaIndividual.cpp index 7552ebf72..dade1619c 100644 --- a/Strategic/MilitiaIndividual.cpp +++ b/Strategic/MilitiaIndividual.cpp @@ -27,7 +27,8 @@ std::vector gIndividualMilitiaVector; MILITIA::MILITIA() { - memset( this, 0, sizeof(MILITIA) ); + memset( this, 0, sizeof(SIZEOF_MILITIA_POD) ); + this->history.clear(); } BOOLEAN diff --git a/Strategic/XML_FacilityTypes.cpp b/Strategic/XML_FacilityTypes.cpp index 5d7561750..2605a7d50 100644 --- a/Strategic/XML_FacilityTypes.cpp +++ b/Strategic/XML_FacilityTypes.cpp @@ -58,8 +58,7 @@ struct UINT32 curIndex; UINT32 currentDepth; UINT32 maxReadDepth; -} -typedef facilitytypeParseData; +} typedef facilitytypeParseData; BOOLEAN FacilityTypes_TextOnly; @@ -173,8 +172,6 @@ facilitytypeStartElementHandle(void *userData, const XML_Char *name, const XML_C { pData->curElement = FACILITYTYPE_TYPE; - memset( &pData->curFacilityTypeData, 0, sizeof(FACILITYTYPE) ); - // Set all values to default before applying XML data InitFacilityTypeEntry( pData ); @@ -1306,7 +1303,6 @@ BOOLEAN ReadInFacilityTypes(STR fileName, BOOLEAN localizedVersion) XML_SetCharacterDataHandler(parser, facilitytypeCharacterDataHandle); - memset(&pData,0,sizeof(pData)); pData.maxArraySize = MAXITEMS; pData.curIndex = 0;