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

Only draw dynamic zone compasses in non-instances

Browse Source 
This fixes compasses being drawn in instances that use the same zone as compass

Also adds RemoveCompass method to quest api
This commit is contained in:
hg 2020-05-26 20:50:15 -04:00
parent 3f4ea66ea1
commit 33f2336244
3 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
zone/client.cpp
View File

@ -9839,7 +9839,7 @@ void Client::SendDzCompassUpdate()
if (expedition) if (expedition)
{ {
auto compass = expedition->GetDynamicZone().GetCompassLocation(); auto compass = expedition->GetDynamicZone().GetCompassLocation();
if (zone && zone->GetZoneID() == compass.zone_id) if (zone && zone->GetZoneID() == compass.zone_id && zone->GetInstanceID() == 0)
{ {
DynamicZoneCompassEntry_Struct entry; DynamicZoneCompassEntry_Struct entry;
entry.dz_zone_id = static_cast<uint16_t>(expedition->GetDynamicZone().GetZoneID()); entry.dz_zone_id = static_cast<uint16_t>(expedition->GetDynamicZone().GetZoneID());
@ -9856,7 +9856,7 @@ void Client::SendDzCompassUpdate()
// todo: shared tasks, missions, and quests with an associated dz // todo: shared tasks, missions, and quests with an associated dz
// compass set via MarkSingleCompassLocation() // compass set via MarkSingleCompassLocation()
if (zone && zone->GetZoneID() == m_quest_compass.zone_id) if (zone && zone->GetZoneID() == m_quest_compass.zone_id && zone->GetInstanceID() == 0)
{ {
DynamicZoneCompassEntry_Struct entry; DynamicZoneCompassEntry_Struct entry;
entry.dz_zone_id = 0; entry.dz_zone_id = 0;

18
zone/lua_expedition.cpp
View File

@ -110,6 +110,11 @@ bool Lua_Expedition::HasReplayLockout() {
return self->HasReplayLockout(); return self->HasReplayLockout();
} }
void Lua_Expedition::RemoveCompass() {
Lua_Safe_Call_Void();
self->SetDzCompass(0, 0, 0, 0, true);
}
void Lua_Expedition::RemoveLockout(std::string event_name) { void Lua_Expedition::RemoveLockout(std::string event_name) {
Lua_Safe_Call_Void(); Lua_Safe_Call_Void();
self->RemoveLockout(event_name); self->RemoveLockout(event_name);
@ -117,12 +122,12 @@ void Lua_Expedition::RemoveLockout(std::string event_name) {
void Lua_Expedition::SetCompass(uint32_t zone_id, float x, float y, float z) { void Lua_Expedition::SetCompass(uint32_t zone_id, float x, float y, float z) {
Lua_Safe_Call_Void(); Lua_Safe_Call_Void();
return self->SetDzCompass(zone_id, x, y, z, true); self->SetDzCompass(zone_id, x, y, z, true);
} }
void Lua_Expedition::SetCompass(std::string zone_name, float x, float y, float z) { void Lua_Expedition::SetCompass(std::string zone_name, float x, float y, float z) {
Lua_Safe_Call_Void(); Lua_Safe_Call_Void();
return self->SetDzCompass(zone_name, x, y, z, true); self->SetDzCompass(zone_name, x, y, z, true);
} }
void Lua_Expedition::SetLocked(bool lock_expedition) { void Lua_Expedition::SetLocked(bool lock_expedition) {
@ -137,17 +142,17 @@ void Lua_Expedition::SetReplayLockoutOnMemberJoin(bool enable) {
void Lua_Expedition::SetSafeReturn(uint32_t zone_id, float x, float y, float z, float heading) { void Lua_Expedition::SetSafeReturn(uint32_t zone_id, float x, float y, float z, float heading) {
Lua_Safe_Call_Void(); Lua_Safe_Call_Void();
return self->SetDzSafeReturn(zone_id, x, y, z, heading, true); self->SetDzSafeReturn(zone_id, x, y, z, heading, true);
} }
void Lua_Expedition::SetSafeReturn(std::string zone_name, float x, float y, float z, float heading) { void Lua_Expedition::SetSafeReturn(std::string zone_name, float x, float y, float z, float heading) {
Lua_Safe_Call_Void(); Lua_Safe_Call_Void();
return self->SetDzSafeReturn(zone_name, x, y, z, heading, true); self->SetDzSafeReturn(zone_name, x, y, z, heading, true);
} }
void Lua_Expedition::SetZoneInLocation(float x, float y, float z, float heading) { void Lua_Expedition::SetZoneInLocation(float x, float y, float z, float heading) {
Lua_Safe_Call_Void(); Lua_Safe_Call_Void();
return self->SetDzZoneInLocation(x, y, z, heading, true); self->SetDzZoneInLocation(x, y, z, heading, true);
} }
luabind::scope lua_register_expedition() { luabind::scope lua_register_expedition() {
@ -167,7 +172,8 @@ luabind::scope lua_register_expedition() {
.def("GetSecondsRemaining", (int(Lua_Expedition::*)(void))&Lua_Expedition::GetSecondsRemaining) .def("GetSecondsRemaining", (int(Lua_Expedition::*)(void))&Lua_Expedition::GetSecondsRemaining)
.def("GetZoneID", (int(Lua_Expedition::*)(void))&Lua_Expedition::GetZoneID) .def("GetZoneID", (int(Lua_Expedition::*)(void))&Lua_Expedition::GetZoneID)
.def("HasLockout", (bool(Lua_Expedition::*)(std::string))&Lua_Expedition::HasLockout) .def("HasLockout", (bool(Lua_Expedition::*)(std::string))&Lua_Expedition::HasLockout)
.def("HasReplayLockout", (bool(Lua_Expedition::*)())&Lua_Expedition::HasReplayLockout) .def("HasReplayLockout", (bool(Lua_Expedition::*)(void))&Lua_Expedition::HasReplayLockout)
.def("RemoveCompass", (void(Lua_Expedition::*)(void))&Lua_Expedition::RemoveCompass)
.def("RemoveLockout", (void(Lua_Expedition::*)(std::string))&Lua_Expedition::RemoveLockout) .def("RemoveLockout", (void(Lua_Expedition::*)(std::string))&Lua_Expedition::RemoveLockout)
.def("SetCompass", (void(Lua_Expedition::*)(uint32_t, float, float, float))&Lua_Expedition::SetCompass) .def("SetCompass", (void(Lua_Expedition::*)(uint32_t, float, float, float))&Lua_Expedition::SetCompass)
.def("SetCompass", (void(Lua_Expedition::*)(std::string, float, float, float))&Lua_Expedition::SetCompass) .def("SetCompass", (void(Lua_Expedition::*)(std::string, float, float, float))&Lua_Expedition::SetCompass)

1
zone/lua_expedition.h
View File

@ -65,6 +65,7 @@ public:
luabind::object GetLockouts(lua_State* L); luabind::object GetLockouts(lua_State* L);
bool HasLockout(std::string event_name); bool HasLockout(std::string event_name);
bool HasReplayLockout(); bool HasReplayLockout();
void RemoveCompass();
void RemoveLockout(std::string event_name); void RemoveLockout(std::string event_name);
void SetCompass(uint32 zone_id, float x, float y, float z); void SetCompass(uint32 zone_id, float x, float y, float z);
void SetCompass(std::string zone_name, float x, float y, float z); void SetCompass(std::string zone_name, float x, float y, float z);