From edeb7d79d174f9c625520ea949d3d896a10a9ce8 Mon Sep 17 00:00:00 2001 From: Athrogate Date: Tue, 12 Jan 2016 19:08:10 -0800 Subject: [PATCH 1/3] Add Lua_Client::ClearCompassMark(). --- changelog.txt | 4 ++++ zone/lua_client.cpp | 6 ++++++ zone/lua_client.h | 1 + 3 files changed, 11 insertions(+) diff --git a/changelog.txt b/changelog.txt index 899bcc22c..2adec24ba 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,5 +1,9 @@ EQEMu Changelog (Started on Sept 24, 2003 15:50) ------------------------------------------------------- +== 01/12/2016 == +Athrogate: Adding ClearCompassMark() to Lua. + - Lua didn't have ClearCompassMark(). Perl already had this. + == 01/12/2016 == Uleat: Fix for tradeskill containers remaining locked after a RoF+ client leaves. Intermediary fix for RoF+ clients accessing tradeskill containers when in use by another player. diff --git a/zone/lua_client.cpp b/zone/lua_client.cpp index 1e785ce9b..82167c85b 100644 --- a/zone/lua_client.cpp +++ b/zone/lua_client.cpp @@ -1067,6 +1067,11 @@ void Lua_Client::MarkSingleCompassLoc(float in_x, float in_y, float in_z, int co self->MarkSingleCompassLoc(in_x, in_y, in_z, count); } +void Lua_Client::ClearCompassMark() { + Lua_Safe_Call_Void(); + self->MarkSingleCompassLoc(0,0,0,0); +} + int Lua_Client::GetNextAvailableSpellBookSlot() { Lua_Safe_Call_Int(); return self->GetNextAvailableSpellBookSlot(); @@ -1548,6 +1553,7 @@ luabind::scope lua_register_client() { .def("GrantAlternateAdvancementAbility", (bool(Lua_Client::*)(int, int, bool))&Lua_Client::GrantAlternateAdvancementAbility) .def("MarkSingleCompassLoc", (void(Lua_Client::*)(float,float,float))&Lua_Client::MarkSingleCompassLoc) .def("MarkSingleCompassLoc", (void(Lua_Client::*)(float,float,float,int))&Lua_Client::MarkSingleCompassLoc) + .def("ClearCompassMark",(void(Lua_Client::*)(void))&Lua_Client::ClearCompassMark) .def("GetNextAvailableSpellBookSlot", (int(Lua_Client::*)(void))&Lua_Client::GetNextAvailableSpellBookSlot) .def("GetNextAvailableSpellBookSlot", (int(Lua_Client::*)(int))&Lua_Client::GetNextAvailableSpellBookSlot) .def("FindSpellBookSlotBySpellID", (int(Lua_Client::*)(int))&Lua_Client::FindSpellBookSlotBySpellID) diff --git a/zone/lua_client.h b/zone/lua_client.h index 4584edfd0..5353996c2 100644 --- a/zone/lua_client.h +++ b/zone/lua_client.h @@ -240,6 +240,7 @@ public: bool GrantAlternateAdvancementAbility(int aa_id, int points, bool ignore_cost); void MarkSingleCompassLoc(float in_x, float in_y, float in_z); void MarkSingleCompassLoc(float in_x, float in_y, float in_z, int count); + void ClearCompassMark(); int GetNextAvailableSpellBookSlot(); int GetNextAvailableSpellBookSlot(int start); int FindSpellBookSlotBySpellID(int spell_id); From 09b6adf7267efb3cdf25299e4e9f5797c636720f Mon Sep 17 00:00:00 2001 From: Athrogate Date: Tue, 12 Jan 2016 19:08:10 -0800 Subject: [PATCH 2/3] Add Lua_Client::ClearCompassMark(). --- zone/lua_client.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zone/lua_client.cpp b/zone/lua_client.cpp index 82167c85b..34906bc00 100644 --- a/zone/lua_client.cpp +++ b/zone/lua_client.cpp @@ -1058,8 +1058,8 @@ bool Lua_Client::GrantAlternateAdvancementAbility(int aa_id, int points, bool ig } void Lua_Client::MarkSingleCompassLoc(float in_x, float in_y, float in_z) { - Lua_Safe_Call_Void(); - self->MarkSingleCompassLoc(in_x, in_y, in_z); + Lua_Safe_Call_Void(); + self->MarkSingleCompassLoc(in_x, in_y, in_z); } void Lua_Client::MarkSingleCompassLoc(float in_x, float in_y, float in_z, int count) { From 0fec2fdfdd37ed882c70f4a1f0154a724bec3fe9 Mon Sep 17 00:00:00 2001 From: Athrogate Date: Tue, 12 Jan 2016 19:08:10 -0800 Subject: [PATCH 3/3] Add Lua_Client::ClearCompassMark(). --- zone/lua_client.cpp | 6 +++--- zone/lua_client.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/zone/lua_client.cpp b/zone/lua_client.cpp index 82167c85b..d77b83c9f 100644 --- a/zone/lua_client.cpp +++ b/zone/lua_client.cpp @@ -1068,8 +1068,8 @@ void Lua_Client::MarkSingleCompassLoc(float in_x, float in_y, float in_z, int co } void Lua_Client::ClearCompassMark() { - Lua_Safe_Call_Void(); - self->MarkSingleCompassLoc(0,0,0,0); + Lua_Safe_Call_Void(); + self->MarkSingleCompassLoc(0,0,0,0); } int Lua_Client::GetNextAvailableSpellBookSlot() { @@ -1553,7 +1553,7 @@ luabind::scope lua_register_client() { .def("GrantAlternateAdvancementAbility", (bool(Lua_Client::*)(int, int, bool))&Lua_Client::GrantAlternateAdvancementAbility) .def("MarkSingleCompassLoc", (void(Lua_Client::*)(float,float,float))&Lua_Client::MarkSingleCompassLoc) .def("MarkSingleCompassLoc", (void(Lua_Client::*)(float,float,float,int))&Lua_Client::MarkSingleCompassLoc) - .def("ClearCompassMark",(void(Lua_Client::*)(void))&Lua_Client::ClearCompassMark) + .def("ClearCompassMark",(void(Lua_Client::*)(void))&Lua_Client::ClearCompassMark) .def("GetNextAvailableSpellBookSlot", (int(Lua_Client::*)(void))&Lua_Client::GetNextAvailableSpellBookSlot) .def("GetNextAvailableSpellBookSlot", (int(Lua_Client::*)(int))&Lua_Client::GetNextAvailableSpellBookSlot) .def("FindSpellBookSlotBySpellID", (int(Lua_Client::*)(int))&Lua_Client::FindSpellBookSlotBySpellID) diff --git a/zone/lua_client.h b/zone/lua_client.h index 5353996c2..36ea2b8a4 100644 --- a/zone/lua_client.h +++ b/zone/lua_client.h @@ -240,7 +240,7 @@ public: bool GrantAlternateAdvancementAbility(int aa_id, int points, bool ignore_cost); void MarkSingleCompassLoc(float in_x, float in_y, float in_z); void MarkSingleCompassLoc(float in_x, float in_y, float in_z, int count); - void ClearCompassMark(); + void ClearCompassMark(); int GetNextAvailableSpellBookSlot(); int GetNextAvailableSpellBookSlot(int start); int FindSpellBookSlotBySpellID(int spell_id);