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

[Dynamic Zones] Rename dynamic zone structs (#1327)

Browse Source 
* Rename dz member id field

The name of the struct is enough to make this implicit

* Rename dz member enum and struct

Rename ExpeditionMember to DynamicZoneMember

Rename ExpeditionMemberStatus to DynamicZoneMemberStatus

* Rename dz window packet structs

This makes it more clear the window may be used by any dynamic zone
system not just expeditions (live missions fill the window when
player doesn't have an active expedition).

* Rename dz window packet fields
This commit is contained in:
hg
2021-04-27 19:53:56 -04:00
committed by GitHub
parent 4358e24dab
commit abf73947f4
31 changed files with 267 additions and 266 deletions
Download Patch File Download Diff File Expand all files Collapse all files
world/expedition.cpp
+9 -9
View File
@@ -48,7 +48,7 @@ void Expedition::RemoveMember(uint32_t character_id)
{
RemoveInternalMember(character_id);
if (character_id == m_leader.char_id)
if (character_id == m_leader.id)
{
ChooseNewLeader();
}
@@ -64,9 +64,9 @@ void Expedition::ChooseNewLeader()
// we don't track expedition member status in world so may choose a linkdead member
// this is fine since it will trigger another change when that member goes offline
auto it = std::find_if(m_members.begin(), m_members.end(), [&](const ExpeditionMember& member) {
if (member.char_id != m_leader.char_id) {
auto member_cle = client_list.FindCLEByCharacterID(member.char_id);
auto it = std::find_if(m_members.begin(), m_members.end(), [&](const DynamicZoneMember& member) {
if (member.id != m_leader.id) {
auto member_cle = client_list.FindCLEByCharacterID(member.id);
return (member_cle && member_cle->GetOnline() == CLE_Status::InZone);
}
return false;
@@ -76,7 +76,7 @@ void Expedition::ChooseNewLeader()
{
// no online members found, fallback to choosing any member
it = std::find_if(m_members.begin(), m_members.end(),
[&](const ExpeditionMember& member) { return (member.char_id != m_leader.char_id); });
[&](const DynamicZoneMember& member) { return (member.id != m_leader.id); });
}
if (it != m_members.end() && SetNewLeader(*it))
@@ -85,15 +85,15 @@ void Expedition::ChooseNewLeader()
}
}
bool Expedition::SetNewLeader(const ExpeditionMember& member)
bool Expedition::SetNewLeader(const DynamicZoneMember& member)
{
if (!HasMember(member.char_id))
if (!HasMember(member.id))
{
return false;
}
LogExpeditionsModerate("Replacing [{}] leader [{}] with [{}]", m_id, m_leader.name, member.name);
ExpeditionDatabase::UpdateLeaderID(m_id, member.char_id);
ExpeditionDatabase::UpdateLeaderID(m_id, member.id);
m_leader = member;
m_dynamic_zone.SetLeaderName(m_leader.name);
SendZonesLeaderChanged();
@@ -125,7 +125,7 @@ void Expedition::SendZonesLeaderChanged()
auto pack = std::make_unique<ServerPacket>(ServerOP_ExpeditionLeaderChanged, pack_size);
auto buf = reinterpret_cast<ServerExpeditionLeaderID_Struct*>(pack->pBuffer);
buf->expedition_id = GetID();
buf->leader_id = m_leader.char_id;
buf->leader_id = m_leader.id;
zoneserver_list.SendPacket(pack.get());
}
world/expedition.h
+1 -1
View File
@@ -41,7 +41,7 @@ public:
void SendZonesExpeditionDeleted();
void SendZonesExpireWarning(uint32_t minutes_remaining);
void SetDynamicZone(DynamicZone&& dz);
bool SetNewLeader(const ExpeditionMember& member);
bool SetNewLeader(const DynamicZoneMember& member);
private:
void SendZonesLeaderChanged();
world/expedition_state.cpp
+2 -2
View File
@@ -115,13 +115,13 @@ void ExpeditionState::CacheExpeditions(
}
void ExpeditionState::MemberChange(
uint32_t expedition_id, const ExpeditionMember& member, bool remove)
uint32_t expedition_id, const DynamicZoneMember& member, bool remove)
{
auto expedition = GetExpedition(expedition_id);
if (expedition)
{
if (remove) {
expedition->RemoveMember(member.char_id);
expedition->RemoveMember(member.id);
} else {
expedition->AddInternalMember(member);
}
world/expedition_state.h
+2 -2
View File
@@ -30,7 +30,7 @@
extern class ExpeditionState expedition_state;
class Expedition;
struct ExpeditionMember;
struct DynamicZoneMember;
class ExpeditionState
{
@@ -40,7 +40,7 @@ public:
void CacheAllFromDatabase();
Expedition* GetExpedition(uint32_t expedition_id);
Expedition* GetExpeditionByDynamicZoneID(uint32_t dz_id);
void MemberChange(uint32_t expedition_id, const ExpeditionMember& member, bool remove);
void MemberChange(uint32_t expedition_id, const DynamicZoneMember& member, bool remove);
void Process();
void RemoveAllMembers(uint32_t expedition_id);