From 03fcdb9a745a7c704438d3ef06d4440026762f71 Mon Sep 17 00:00:00 2001 From: Wanne Date: Sat, 8 Mar 2014 13:27:47 +0000 Subject: [PATCH] Merged from revision: 7038 - Added support for language specific PocketPopups.xml (*.PocketPopups.xml) git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7039 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Init.cpp | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/Init.cpp b/Init.cpp index 20750e54..99e307c9 100644 --- a/Init.cpp +++ b/Init.cpp @@ -426,6 +426,27 @@ BOOLEAN LoadExternalGameplayData(STR directoryName) strcat(fileName, LBEPOCKETPOPUPFILENAME); SGP_THROW_IFFALSE(ReadInLBEPocketPopups(fileName),LBEPOCKETPOPUPFILENAME); +#ifndef ENGLISH + AddLanguagePrefix(fileName); + + if (FileExists(fileName)) + { + // WANNE: Load language specific file + SGP_THROW_IFFALSE(ReadInLBEPocketPopups(fileName),LBEPOCKETPOPUPFILENAME); + } + else + { + // WANNE: If we fail to load, try loading just the default english file + strcpy(fileName, directoryName); + strcat(fileName, LBEPOCKETPOPUPFILENAME); + SGP_THROW_IFFALSE(ReadInLBEPocketPopups(fileName),LBEPOCKETPOPUPFILENAME); + } +#else + // WANNE: Load english file + SGP_THROW_IFFALSE(ReadInLBEPocketPopups(fileName),LBEPOCKETPOPUPFILENAME); +#endif + + #ifdef JA2UB strcpy(fileName, directoryName);