Merge branch 'ryzom/ark/features' into yubo

fix_opengl_on_mac
Ulukyn 5 years ago
commit 48a9a84d0e

@ -591,6 +591,7 @@ void CLuaIHMRyzom::RegisterRyzomFunctions(NLGUI::CLuaState &ls)
LUABIND_FUNC(updateTooltipCoords),
LUABIND_FUNC(isCtrlKeyDown),
LUABIND_FUNC(encodeURLUnicodeParam),
LUABIND_FUNC(encodeURLParam),
LUABIND_FUNC(getPlayerLevel),
LUABIND_FUNC(getPlayerVpa),
LUABIND_FUNC(getPlayerVpb),
@ -3772,6 +3773,13 @@ std::string CLuaIHMRyzom::encodeURLUnicodeParam(const ucstring &text)
return convertToHTML(text.toUtf8());
}
// ***************************************************************************
std::string CLuaIHMRyzom::encodeURLParam(const string &text)
{
//H_AUTO(Lua_CLuaIHM_encodeURLUnicodeParam)
return convertToHTML(text);
}
// ***************************************************************************
sint32 CLuaIHMRyzom::getPlayerLevel()
{

@ -259,6 +259,7 @@ private:
// because it would be too easy to write a key recorder ...)
static bool isCtrlKeyDown();
static std::string encodeURLUnicodeParam(const ucstring &text);
static std::string encodeURLParam(const std::string &text);
static sint32 getPlayerLevel(); // get max level among player skills (magi, combat, crafting ,foraging)
static std::string getPlayerVpaHex();

Loading…
Cancel
Save