From 7c091f3a125b0d81cd197f9f9ca4e86f1f4640b4 Mon Sep 17 00:00:00 2001 From: kervala Date: Sat, 7 Nov 2015 22:56:45 +0100 Subject: [PATCH 1/2] Changed: Use new Ryzom icon under Windows --- code/ryzom/client/src/client.rc | 2 +- code/ryzom/client/src/ryzom.ico | Bin 155683 -> 145555 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/code/ryzom/client/src/client.rc b/code/ryzom/client/src/client.rc index d256df313..b0bb98b9e 100644 --- a/code/ryzom/client/src/client.rc +++ b/code/ryzom/client/src/client.rc @@ -54,7 +54,7 @@ END // Icon with lowest ID value placed first to ensure application icon // remains consistent on all systems. -IDI_MAIN_ICON ICON DISCARDABLE "ryzom_small.ico" +IDI_MAIN_ICON ICON DISCARDABLE "ryzom.ico" #endif // English (U.S.) resources ///////////////////////////////////////////////////////////////////////////// diff --git a/code/ryzom/client/src/ryzom.ico b/code/ryzom/client/src/ryzom.ico index 5f4f39ed37f7bfba784f11dd7ac4fb4463868b08..3470b6c1605fba898a56b98cadc8128f162a2e51 100644 GIT binary patch delta 161 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 Date: Sat, 7 Nov 2015 22:57:41 +0100 Subject: [PATCH 2/2] Changed: Minor changes --- code/ryzom/client/src/browse_faq.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/code/ryzom/client/src/browse_faq.cpp b/code/ryzom/client/src/browse_faq.cpp index 8311087eb..3899a2960 100644 --- a/code/ryzom/client/src/browse_faq.cpp +++ b/code/ryzom/client/src/browse_faq.cpp @@ -24,21 +24,26 @@ void browseFAQ(NLMISC::CConfigFile &cf) std::string url; std::string languageCode = "wk"; CConfigFile::CVar *languageCodeVarPtr = cf.getVarPtr("LanguageCode"); + if (languageCodeVarPtr) { languageCode = languageCodeVarPtr->asString(); } + CConfigFile::CVar *helpPages = cf.getVarPtr("HelpPages"); + if (helpPages) { for (uint i = 0; i < helpPages->size(); ++i) { std::string entry = helpPages->asString(i); + if (entry.size() >= languageCode.size()) { if (nlstricmp(entry.substr(0, languageCode.size()), languageCode) == 0) { std::string::size_type pos = entry.find("="); + if (pos != std::string::npos) { url = entry.substr(pos + 1);