1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-07-22 13:40:22 +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);
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
}