1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-09-16 14:47:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

- Bugfix: Fixed the problem with not initialized merc quotes

Browse Source 
o The problem was, that the file "MercQuote.xml" was never initialized. Now it should read from the file, but only if READ_PROFILE_DATA_FROM_XML = TRUE, otherwise it reads the values from prof*.dat

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5150 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2012-04-03 08:46:59 +00:00
parent 628e54cfe8
commit 076f390aba
3 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Init.cpp
+7
View File
@@ -706,6 +706,13 @@ BOOLEAN LoadExternalGameplayData(STR directoryName)
strcat(fileName, MERCOPINIONSFILENAME); strcat(fileName, MERCOPINIONSFILENAME);
DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName)); DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
SGP_THROW_IFFALSE(ReadInMercOpinions(fileName), MERCOPINIONSFILENAME); 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 #endif
} }
Tactical/XML.h
+4 -2
View File
@@ -165,6 +165,8 @@ typedef PARSE_STAGE;
#define MERCPROFILESFILENAME "MercProfiles.xml" #define MERCPROFILESFILENAME "MercProfiles.xml"
// HEADROCK PROFEX: Merc Opinions [2009-07-27] // HEADROCK PROFEX: Merc Opinions [2009-07-27]
#define MERCOPINIONSFILENAME "MercOpinions.xml" #define MERCOPINIONSFILENAME "MercOpinions.xml"
// WANNE: The merc quotes
#define MERCQUOTEFILENAME "MercQuote.xml"
// HEADROCK HAM 3.6: Bloodcat Placements [2009-07-31] // HEADROCK HAM 3.6: Bloodcat Placements [2009-07-31]
#define BLOODCATPLACEMENTSFILENAME "Map\\BloodcatPlacements.xml" #define BLOODCATPLACEMENTSFILENAME "Map\\BloodcatPlacements.xml"
// HEADROCK HAM 3.6: Uniform Colors [2009-09-29] // 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 ReadInAimAvailability(STR fileName, BOOLEAN localizedVersion);
extern BOOLEAN WriteAimAvailability(STR fileName); extern BOOLEAN WriteAimAvailability(STR fileName);
extern BOOLEAN WriteQarray(QARRAY_VALUES *pQarray, STR fileName); extern BOOLEAN WriteMercQuotes(QARRAY_VALUES *pQarray, STR fileName);
extern BOOLEAN ReadInQarray(QARRAY_VALUES *pQarray, STR fileName); extern BOOLEAN ReadInMercQuotes(QARRAY_VALUES *pQarray, STR fileName);
extern BOOLEAN WriteFaceGear(); extern BOOLEAN WriteFaceGear();
extern BOOLEAN ReadInFaceGear( FACE_GEAR_VALUES *pFaceGear, STR fileName ); extern BOOLEAN ReadInFaceGear( FACE_GEAR_VALUES *pFaceGear, STR fileName );
Tactical/XML_Qarray.cpp
+3 -3
View File
@@ -153,7 +153,7 @@ qarrayEndElementHandle(void *userData, const XML_Char *name)
pData->currentDepth--; pData->currentDepth--;
} }
BOOLEAN ReadInQarray(QARRAY_VALUES *pQarray, STR fileName) BOOLEAN ReadInMercQuotes(QARRAY_VALUES *pQarray, STR fileName)
{ {
HWFILE hFile; HWFILE hFile;
UINT32 uiBytesRead; UINT32 uiBytesRead;
@@ -163,7 +163,7 @@ BOOLEAN ReadInQarray(QARRAY_VALUES *pQarray, STR fileName)
qarrayParseData pData; qarrayParseData pData;
DebugMsg(TOPIC_JA2, DBG_LEVEL_3, "Loading Qarray.xml" ); DebugMsg(TOPIC_JA2, DBG_LEVEL_3, "Loading MercQuote.xml" );
// Open file // 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; HWFILE hFile;