diff --git a/Init.cpp b/Init.cpp index fc4cb906..20a92783 100644 --- a/Init.cpp +++ b/Init.cpp @@ -706,6 +706,13 @@ BOOLEAN LoadExternalGameplayData(STR directoryName) strcat(fileName, MERCOPINIONSFILENAME); DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName)); SGP_THROW_IFFALSE(ReadInMercOpinions(fileName), MERCOPINIONSFILENAME); + + // WANNE: Read in the MercQuotes.xml file + strcpy(fileName, directoryName); + strcat(fileName, MERCQUOTEFILENAME); + DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName)); + SGP_THROW_IFFALSE(ReadInMercQuotes(QuoteExp, fileName), MERCQUOTEFILENAME); + #endif } diff --git a/Tactical/XML.h b/Tactical/XML.h index bc8a250d..9225e7c3 100644 --- a/Tactical/XML.h +++ b/Tactical/XML.h @@ -165,6 +165,8 @@ typedef PARSE_STAGE; #define MERCPROFILESFILENAME "MercProfiles.xml" // HEADROCK PROFEX: Merc Opinions [2009-07-27] #define MERCOPINIONSFILENAME "MercOpinions.xml" +// WANNE: The merc quotes +#define MERCQUOTEFILENAME "MercQuote.xml" // HEADROCK HAM 3.6: Bloodcat Placements [2009-07-31] #define BLOODCATPLACEMENTSFILENAME "Map\\BloodcatPlacements.xml" // HEADROCK HAM 3.6: Uniform Colors [2009-09-29] @@ -435,8 +437,8 @@ extern BOOLEAN WriteMercAvailability(STR fileName); extern BOOLEAN ReadInAimAvailability(STR fileName, BOOLEAN localizedVersion); extern BOOLEAN WriteAimAvailability(STR fileName); -extern BOOLEAN WriteQarray(QARRAY_VALUES *pQarray, STR fileName); -extern BOOLEAN ReadInQarray(QARRAY_VALUES *pQarray, STR fileName); +extern BOOLEAN WriteMercQuotes(QARRAY_VALUES *pQarray, STR fileName); +extern BOOLEAN ReadInMercQuotes(QARRAY_VALUES *pQarray, STR fileName); extern BOOLEAN WriteFaceGear(); extern BOOLEAN ReadInFaceGear( FACE_GEAR_VALUES *pFaceGear, STR fileName ); diff --git a/Tactical/XML_Qarray.cpp b/Tactical/XML_Qarray.cpp index 0e805b74..f6c06a0a 100644 --- a/Tactical/XML_Qarray.cpp +++ b/Tactical/XML_Qarray.cpp @@ -153,7 +153,7 @@ qarrayEndElementHandle(void *userData, const XML_Char *name) pData->currentDepth--; } -BOOLEAN ReadInQarray(QARRAY_VALUES *pQarray, STR fileName) +BOOLEAN ReadInMercQuotes(QARRAY_VALUES *pQarray, STR fileName) { HWFILE hFile; UINT32 uiBytesRead; @@ -163,7 +163,7 @@ BOOLEAN ReadInQarray(QARRAY_VALUES *pQarray, STR fileName) qarrayParseData pData; - DebugMsg(TOPIC_JA2, DBG_LEVEL_3, "Loading Qarray.xml" ); + DebugMsg(TOPIC_JA2, DBG_LEVEL_3, "Loading MercQuote.xml" ); // Open file @@ -219,7 +219,7 @@ BOOLEAN ReadInQarray(QARRAY_VALUES *pQarray, STR fileName) -BOOLEAN WriteQarray(QARRAY_VALUES *pQarray, STR fileName) +BOOLEAN WriteMercQuotes(QARRAY_VALUES *pQarray, STR fileName) { HWFILE hFile;