Merge with develop

--HG--
branch : compatibility-develop
hg/compatibility-develop
Nimetu 6 years ago
commit 5cc2a0c280

@ -551,6 +551,7 @@ void CLuaIHMRyzom::RegisterRyzomFunctions(NLGUI::CLuaState &ls)
LUABIND_FUNC(getClientCfg), LUABIND_FUNC(getClientCfg),
LUABIND_FUNC(sendMsgToServer), LUABIND_FUNC(sendMsgToServer),
LUABIND_FUNC(sendMsgToServerPvpTag), LUABIND_FUNC(sendMsgToServerPvpTag),
LUABIND_FUNC(sendMsgToServerUseItem),
LUABIND_FUNC(isGuildQuitAvailable), LUABIND_FUNC(isGuildQuitAvailable),
LUABIND_FUNC(sortGuildMembers), LUABIND_FUNC(sortGuildMembers),
LUABIND_FUNC(getNbGuildMembers), LUABIND_FUNC(getNbGuildMembers),
@ -3399,6 +3400,16 @@ void CLuaIHMRyzom::sendMsgToServerPvpTag(bool pvpTag)
::sendMsgToServer("PVP:PVP_TAG", tag); ::sendMsgToServer("PVP:PVP_TAG", tag);
} }
// ***************************************************************************
void CLuaIHMRyzom::sendMsgToServerUseItem(sint32 slot)
{
//H_AUTO(Lua_CLuaIHM_sendMsgToServerUseItem)
uint8 u8n1 = (uint8)((uint16)slot >> 8);
uint8 u8n2 = (uint8)((uint16)slot & 0x00FF);
::sendMsgToServer("ITEM:USE_ITEM", u8n1, u8n2);
}
// *************************************************************************** // ***************************************************************************
bool CLuaIHMRyzom::isGuildQuitAvailable() bool CLuaIHMRyzom::isGuildQuitAvailable()
{ {

@ -202,6 +202,7 @@ private:
static std::string getClientCfg(const std::string &varName); static std::string getClientCfg(const std::string &varName);
static void sendMsgToServer(const std::string &msgName); static void sendMsgToServer(const std::string &msgName);
static void sendMsgToServerPvpTag(bool pvpTag); static void sendMsgToServerPvpTag(bool pvpTag);
static void sendMsgToServerUseItem(sint32 slot);
static bool isGuildQuitAvailable(); static bool isGuildQuitAvailable();
static void sortGuildMembers(); static void sortGuildMembers();
static sint32 getNbGuildMembers(); static sint32 getNbGuildMembers();

Loading…
Cancel
Save