Fix: memset bugs (by Asdow).

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9275 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Sevenfm
2022-01-25 11:25:03 +00:00
parent e887f85a44
commit bc8fac5c3e
2 changed files with 3 additions and 6 deletions
+2 -1
View File
@@ -27,7 +27,8 @@ std::vector<MILITIA> gIndividualMilitiaVector;
MILITIA::MILITIA()
{
memset( this, 0, sizeof(MILITIA) );
memset( this, 0, sizeof(SIZEOF_MILITIA_POD) );
this->history.clear();
}
BOOLEAN
+1 -5
View File
@@ -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;