pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-12 09:31:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #490 from AthrogatePEQ/master

Browse Source 
Lua_Client::ClearCompassMark()
This commit is contained in:
Michael Cook (mackal) 2016-01-12 22:56:18 -05:00
commit 3048eca5ad
3 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changelog.txt
View File

@ -1,5 +1,9 @@
EQEMu Changelog (Started on Sept 24, 2003 15:50) 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 == == 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. 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.

6
zone/lua_client.cpp
View File

@ -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); 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() { int Lua_Client::GetNextAvailableSpellBookSlot() {
Lua_Safe_Call_Int(); Lua_Safe_Call_Int();
return self->GetNextAvailableSpellBookSlot(); return self->GetNextAvailableSpellBookSlot();
@ -1548,6 +1553,7 @@ luabind::scope lua_register_client() {
.def("GrantAlternateAdvancementAbility", (bool(Lua_Client::*)(int, int, bool))&Lua_Client::GrantAlternateAdvancementAbility) .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))&Lua_Client::MarkSingleCompassLoc)
.def("MarkSingleCompassLoc", (void(Lua_Client::*)(float,float,float,int))&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::*)(void))&Lua_Client::GetNextAvailableSpellBookSlot)
.def("GetNextAvailableSpellBookSlot", (int(Lua_Client::*)(int))&Lua_Client::GetNextAvailableSpellBookSlot) .def("GetNextAvailableSpellBookSlot", (int(Lua_Client::*)(int))&Lua_Client::GetNextAvailableSpellBookSlot)
.def("FindSpellBookSlotBySpellID", (int(Lua_Client::*)(int))&Lua_Client::FindSpellBookSlotBySpellID) .def("FindSpellBookSlotBySpellID", (int(Lua_Client::*)(int))&Lua_Client::FindSpellBookSlotBySpellID)

1
zone/lua_client.h
View File

@ -240,6 +240,7 @@ public:
bool GrantAlternateAdvancementAbility(int aa_id, int points, bool ignore_cost); 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);
void MarkSingleCompassLoc(float in_x, float in_y, float in_z, int count); void MarkSingleCompassLoc(float in_x, float in_y, float in_z, int count);
void ClearCompassMark();
int GetNextAvailableSpellBookSlot(); int GetNextAvailableSpellBookSlot();
int GetNextAvailableSpellBookSlot(int start); int GetNextAvailableSpellBookSlot(int start);
int FindSpellBookSlotBySpellID(int spell_id); int FindSpellBookSlotBySpellID(int spell_id);