aleajactaest/khanat-code-old
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/khanat-code-old.git synced 2024-12-25 02:00:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge

Browse source
This commit is contained in:
kervala 2015-11-08 10:48:42 +01:00
commit 651d0e1e68
3 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
code/ryzom/client/src/browse_faq.cpp
View file

@ -24,21 +24,26 @@ void browseFAQ(NLMISC::CConfigFile &cf)
std::string url; std::string url;
std::string languageCode = "wk"; std::string languageCode = "wk";
CConfigFile::CVar *languageCodeVarPtr = cf.getVarPtr("LanguageCode"); CConfigFile::CVar *languageCodeVarPtr = cf.getVarPtr("LanguageCode");
if (languageCodeVarPtr) if (languageCodeVarPtr)
{ {
languageCode = languageCodeVarPtr->asString(); languageCode = languageCodeVarPtr->asString();
} }
CConfigFile::CVar *helpPages = cf.getVarPtr("HelpPages"); CConfigFile::CVar *helpPages = cf.getVarPtr("HelpPages");
if (helpPages) if (helpPages)
{ {
for (uint i = 0; i < helpPages->size(); ++i) for (uint i = 0; i < helpPages->size(); ++i)
{ {
std::string entry = helpPages->asString(i); std::string entry = helpPages->asString(i);
if (entry.size() >= languageCode.size()) if (entry.size() >= languageCode.size())
{ {
if (nlstricmp(entry.substr(0, languageCode.size()), languageCode) == 0) if (nlstricmp(entry.substr(0, languageCode.size()), languageCode) == 0)
{ {
std::string::size_type pos = entry.find("="); std::string::size_type pos = entry.find("=");
if (pos != std::string::npos) if (pos != std::string::npos)
{ {
url = entry.substr(pos + 1); url = entry.substr(pos + 1);

2
code/ryzom/client/src/client.rc
View file

@ -54,7 +54,7 @@ END
// Icon with lowest ID value placed first to ensure application icon // Icon with lowest ID value placed first to ensure application icon
// remains consistent on all systems. // 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 #endif // English (U.S.) resources
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////

BIN
code/ryzom/client/src/ryzom.ico
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 152 KiB

After

Width:  |  Height:  |  Size: 142 KiB