aleajactaest/khanat-opennel-code
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/khanat-opennel-code.git synced 2024-11-26 17:16:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge with develop

Browse source 
--HG--
branch : compatibility-develop
This commit is contained in:
kervala 2016-03-18 22:27:43 +01:00
commit 1eddef3c93
3 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
code/nel/src/misc/i18n.cpp
View file

@ -382,11 +382,9 @@ std::string CI18N::getSystemLanguageCode ()
}
}
#else
std::string lang = NLMISC::toLower(lang);
// only keep 2 first characters
if (lang.size() > 1)
_SystemLanguageCode = lang.substr(0, 2);
_SystemLanguageCode = NLMISC::toLower(lang).substr(0, 2);
#endif
}
}

2
code/ryzom/common/src/game_share/mirrored_data_set_inline.h
View file

@ -205,7 +205,7 @@ inline bool CMirroredDataSet::propIsList( TPropertyIndex propIndex ) const
* Display the values of one property for all entities
*/
template <class T, class CPropLocationClass>
inline void CMirroredDataSet::displayPropValues( TPropertyIndex propIndex, T* pt, NLMISC::CLog& log ) const
inline void CMirroredDataSet::displayPropValues( TPropertyIndex propIndex, T* /* pt */, NLMISC::CLog& log ) const
{
// std::stringstream ss;
// ss << "Mirror property " << propIndex << ":" << endl;

2
code/ryzom/tools/client/client_patcher/main.cpp
View file

@ -5,8 +5,6 @@
#include "nel/misc/cmd_args.h"
#include <locale.h>
#ifdef NL_OS_WINDOWS
#include <windows.h>
#endif