pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-06-11 11:48:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Expeditions] Create common dz abstract class (#1312)

Browse Source 
This creates an abstract class in common so zone and world can share
most of the implementation. World now has access to the same dz data and
api as zone.

Rename CharacterChange to AddRemoveCharacter for clarity

Rename GetRemainingDuration to GetDurationRemaining for consistency

Move dynamic zone queries to custom repository methods
This commit is contained in:
hg
2021-03-29 03:17:36 -04:00
committed by GitHub
parent f5cf566fca
commit 049fe55c7f
16 changed files with 814 additions and 623 deletions
Download Patch File Download Diff File Expand all files Collapse all files
world/dynamic_zone.cpp
+58 -10
View File
@@ -12,16 +12,21 @@ extern ZSList zoneserver_list;
DynamicZone::DynamicZone(
uint32_t id, uint32_t zone_id, uint32_t instance_id, uint32_t zone_version,
uint32_t start_time, uint32_t duration, DynamicZoneType type
) :
m_id(id),
m_instance_id(instance_id),
m_zone_id(zone_id),
m_zone_version(zone_version),
m_start_time(std::chrono::system_clock::from_time_t(start_time)),
m_duration(duration),
m_type(type),
m_expire_time(m_start_time + m_duration)
)
{
m_id = id;
m_instance_id = instance_id;
m_zone_id = zone_id;
m_zone_version = zone_version;
m_start_time = std::chrono::system_clock::from_time_t(start_time);
m_duration = std::chrono::seconds(duration);
m_type = type;
m_expire_time = m_start_time + m_duration;
}
Database& DynamicZone::GetDatabase()
{
return database;
}
DynamicZone* DynamicZone::FindDynamicZoneByID(uint32_t dz_id)
@@ -99,10 +104,27 @@ void DynamicZone::HandleZoneMessage(ServerPacket* pack)
case ServerOP_DzSetSafeReturn:
case ServerOP_DzSetZoneIn:
{
auto buf = reinterpret_cast<ServerDzLocation_Struct*>(pack->pBuffer);
auto dz = DynamicZone::FindDynamicZoneByID(buf->dz_id);
if (dz)
{
if (pack->opcode == ServerOP_DzSetCompass)
{
dz->SetCompass(buf->zone_id, buf->x, buf->y, buf->z, false);
}
else if (pack->opcode == ServerOP_DzSetSafeReturn)
{
dz->SetSafeReturn(buf->zone_id, buf->x, buf->y, buf->z, buf->heading, false);
}
else if (pack->opcode == ServerOP_DzSetZoneIn)
{
dz->SetZoneInLocation(buf->x, buf->y, buf->z, buf->heading, false);
}
}
zoneserver_list.SendPacket(pack);
break;
}
case ServerOP_DzCharacterChange:
case ServerOP_DzAddRemoveCharacter:
case ServerOP_DzRemoveAllCharacters:
{
auto buf = reinterpret_cast<ServerDzCharacter_Struct*>(pack->pBuffer);
@@ -125,3 +147,29 @@ void DynamicZone::HandleZoneMessage(ServerPacket* pack)
}
};
}
void DynamicZone::SendInstanceAddRemoveCharacter(uint32_t character_id, bool remove)
{
ZoneServer* instance_zs = zoneserver_list.FindByInstanceID(GetInstanceID());
if (instance_zs)
{
auto pack = CreateServerAddRemoveCharacterPacket(character_id, remove);
instance_zs->SendPacket(pack.get());
}
}
void DynamicZone::SendInstanceRemoveAllCharacters()
{
ZoneServer* instance_zs = zoneserver_list.FindByInstanceID(GetInstanceID());
if (instance_zs)
{
auto pack = CreateServerRemoveAllCharactersPacket();
instance_zs->SendPacket(pack.get());
}
}
void DynamicZone::SendGlobalLocationChange(uint16_t server_opcode, const DynamicZoneLocation& location)
{
auto pack = CreateServerDzLocationPacket(server_opcode, location);
zoneserver_list.SendPacket(pack.get());
}