diff --git a/common/eq_packet_structs.h b/common/eq_packet_structs.h index 22be26b1d..57d4c0795 100644 --- a/common/eq_packet_structs.h +++ b/common/eq_packet_structs.h @@ -4873,14 +4873,14 @@ struct ExpeditionInfo_Struct struct ExpeditionMemberEntry_Struct { -/*000*/ char name[64]; // variable length, null terminated, max 0x40 (64) -/*064*/ uint8 status; // 0: unknown, 1: Online, 2: Offline, 3: In Dynamic Zone, 4: Link Dead +/*000*/ char name[64]; // variable length, null terminated, max 0x40 (64) +/*064*/ uint8 expedition_status; // 0: unknown, 1: Online, 2: Offline, 3: In Dynamic Zone, 4: Link Dead }; struct ExpeditionMemberList_Struct { /*000*/ uint32 client_id; -/*004*/ uint32 count; +/*004*/ uint32 member_count; /*008*/ ExpeditionMemberEntry_Struct members[0]; // variable length }; diff --git a/common/patches/rof.cpp b/common/patches/rof.cpp index 3549a0c2c..cb5400f1f 100644 --- a/common/patches/rof.cpp +++ b/common/patches/rof.cpp @@ -839,11 +839,11 @@ namespace RoF SerializeBuffer buf; buf.WriteUInt32(emu->client_id); - buf.WriteUInt32(emu->count); - for (uint32 i = 0; i < emu->count; ++i) + buf.WriteUInt32(emu->member_count); + for (uint32 i = 0; i < emu->member_count; ++i) { buf.WriteString(emu->members[i].name); - buf.WriteUInt8(emu->members[i].status); + buf.WriteUInt8(emu->members[i].expedition_status); } __packet->size = buf.size(); @@ -868,7 +868,7 @@ namespace RoF ENCODE(OP_DzMemberListStatus) { auto emu = reinterpret_cast((*p)->pBuffer); - if (emu->count == 1) + if (emu->member_count == 1) { ENCODE_FORWARD(OP_DzMemberList); } diff --git a/common/patches/rof2.cpp b/common/patches/rof2.cpp index bc53369ae..4a902061d 100644 --- a/common/patches/rof2.cpp +++ b/common/patches/rof2.cpp @@ -888,11 +888,11 @@ namespace RoF2 SerializeBuffer buf; buf.WriteUInt32(emu->client_id); - buf.WriteUInt32(emu->count); - for (uint32 i = 0; i < emu->count; ++i) + buf.WriteUInt32(emu->member_count); + for (uint32 i = 0; i < emu->member_count; ++i) { buf.WriteString(emu->members[i].name); - buf.WriteUInt8(emu->members[i].status); + buf.WriteUInt8(emu->members[i].expedition_status); } __packet->size = buf.size(); @@ -917,7 +917,7 @@ namespace RoF2 ENCODE(OP_DzMemberListStatus) { auto emu = reinterpret_cast((*p)->pBuffer); - if (emu->count == 1) + if (emu->member_count == 1) { ENCODE_FORWARD(OP_DzMemberList); } diff --git a/common/patches/rof2_structs.h b/common/patches/rof2_structs.h index b1be0c00a..c5111da6d 100644 --- a/common/patches/rof2_structs.h +++ b/common/patches/rof2_structs.h @@ -4921,14 +4921,14 @@ struct ExpeditionInfo_Struct struct ExpeditionMemberEntry_Struct { -/*000*/ char name[1]; // variable length, null terminated, max 0x40 (64) -/*000*/ uint8 status; // 0: unknown 1: Online, 2: Offline, 3: In Dynamic Zone, 4: Link Dead +/*000*/ char name[1]; // variable length, null terminated, max 0x40 (64) +/*000*/ uint8 expedition_status; // 0: unknown 1: Online, 2: Offline, 3: In Dynamic Zone, 4: Link Dead }; struct ExpeditionMemberList_Struct { /*000*/ uint32 client_id; -/*004*/ uint32 count; // number of players in window +/*004*/ uint32 member_count; // number of players in window /*008*/ ExpeditionMemberEntry_Struct members[0]; // variable length }; diff --git a/common/patches/rof_structs.h b/common/patches/rof_structs.h index 6fa44177e..a67e7b972 100644 --- a/common/patches/rof_structs.h +++ b/common/patches/rof_structs.h @@ -4853,14 +4853,14 @@ struct ExpeditionInfo_Struct struct ExpeditionMemberEntry_Struct { -/*000*/ char name[1]; // variable length, null terminated, max 0x40 (64) -/*000*/ uint8 status; // 0: unknown 1: Online, 2: Offline, 3: In Dynamic Zone, 4: Link Dead +/*000*/ char name[1]; // variable length, null terminated, max 0x40 (64) +/*000*/ uint8 expedition_status; // 0: unknown 1: Online, 2: Offline, 3: In Dynamic Zone, 4: Link Dead }; struct ExpeditionMemberList_Struct { /*000*/ uint32 client_id; -/*004*/ uint32 count; // number of players in window +/*004*/ uint32 member_count; // number of players in window /*008*/ ExpeditionMemberEntry_Struct members[0]; // variable length }; diff --git a/common/patches/sod.cpp b/common/patches/sod.cpp index 1857cd731..d6eae5838 100644 --- a/common/patches/sod.cpp +++ b/common/patches/sod.cpp @@ -612,11 +612,11 @@ namespace SoD SerializeBuffer buf; buf.WriteUInt32(emu->client_id); - buf.WriteUInt32(emu->count); - for (uint32 i = 0; i < emu->count; ++i) + buf.WriteUInt32(emu->member_count); + for (uint32 i = 0; i < emu->member_count; ++i) { buf.WriteString(emu->members[i].name); - buf.WriteUInt8(emu->members[i].status); + buf.WriteUInt8(emu->members[i].expedition_status); } __packet->size = buf.size(); @@ -641,7 +641,7 @@ namespace SoD ENCODE(OP_DzMemberListStatus) { auto emu = reinterpret_cast((*p)->pBuffer); - if (emu->count == 1) + if (emu->member_count == 1) { ENCODE_FORWARD(OP_DzMemberList); } diff --git a/common/patches/sod_structs.h b/common/patches/sod_structs.h index 514722cb1..4e7735bf1 100644 --- a/common/patches/sod_structs.h +++ b/common/patches/sod_structs.h @@ -4208,14 +4208,14 @@ struct ExpeditionInfo_Struct struct ExpeditionMemberEntry_Struct { -/*000*/ char name[1]; // variable length, null terminated, max 0x40 (64) -/*000*/ uint8 status; // 0: unknown 1: Online, 2: Offline, 3: In Dynamic Zone, 4: Link Dead +/*000*/ char name[1]; // variable length, null terminated, max 0x40 (64) +/*000*/ uint8 expedition_status; // 0: unknown 1: Online, 2: Offline, 3: In Dynamic Zone, 4: Link Dead }; struct ExpeditionMemberList_Struct { /*000*/ uint32 client_id; -/*004*/ uint32 count; // number of players in window +/*004*/ uint32 member_count; // number of players in window /*008*/ ExpeditionMemberEntry_Struct members[0]; // variable length }; diff --git a/common/patches/sof.cpp b/common/patches/sof.cpp index ddef71c4c..f24f265ff 100644 --- a/common/patches/sof.cpp +++ b/common/patches/sof.cpp @@ -600,11 +600,11 @@ namespace SoF SerializeBuffer buf; buf.WriteUInt32(emu->client_id); - buf.WriteUInt32(emu->count); - for (uint32 i = 0; i < emu->count; ++i) + buf.WriteUInt32(emu->member_count); + for (uint32 i = 0; i < emu->member_count; ++i) { buf.WriteString(emu->members[i].name); - buf.WriteUInt8(emu->members[i].status); + buf.WriteUInt8(emu->members[i].expedition_status); } __packet->size = buf.size(); @@ -629,7 +629,7 @@ namespace SoF ENCODE(OP_DzMemberListStatus) { auto emu = reinterpret_cast((*p)->pBuffer); - if (emu->count == 1) + if (emu->member_count == 1) { ENCODE_FORWARD(OP_DzMemberList); } diff --git a/common/patches/sof_structs.h b/common/patches/sof_structs.h index 7755e767f..bf88bf5c2 100644 --- a/common/patches/sof_structs.h +++ b/common/patches/sof_structs.h @@ -4123,14 +4123,14 @@ struct ExpeditionInfo_Struct struct ExpeditionMemberEntry_Struct { -/*000*/ char name[1]; // variable length, null terminated, max 0x40 (64) -/*000*/ uint8 status; // 0: unknown 1: Online, 2: Offline, 3: In Dynamic Zone, 4: Link Dead +/*000*/ char name[1]; // variable length, null terminated, max 0x40 (64) +/*000*/ uint8 expedition_status; // 0: unknown 1: Online, 2: Offline, 3: In Dynamic Zone, 4: Link Dead }; struct ExpeditionMemberList_Struct { /*000*/ uint32 client_id; -/*004*/ uint32 count; +/*004*/ uint32 member_count; /*008*/ ExpeditionMemberEntry_Struct members[0]; // variable length }; diff --git a/common/patches/titanium.cpp b/common/patches/titanium.cpp index 04fd10d9c..f7d97b8d9 100644 --- a/common/patches/titanium.cpp +++ b/common/patches/titanium.cpp @@ -543,11 +543,11 @@ namespace Titanium SerializeBuffer buf; buf.WriteUInt32(emu->client_id); - buf.WriteUInt32(emu->count); - for (uint32 i = 0; i < emu->count; ++i) + buf.WriteUInt32(emu->member_count); + for (uint32 i = 0; i < emu->member_count; ++i) { buf.WriteString(emu->members[i].name); - buf.WriteUInt8(emu->members[i].status); + buf.WriteUInt8(emu->members[i].expedition_status); } __packet->size = buf.size(); @@ -572,7 +572,7 @@ namespace Titanium ENCODE(OP_DzMemberListStatus) { auto emu = reinterpret_cast((*p)->pBuffer); - if (emu->count == 1) + if (emu->member_count == 1) { ENCODE_FORWARD(OP_DzMemberList); } diff --git a/common/patches/titanium_structs.h b/common/patches/titanium_structs.h index 092c3d2a3..b2beae0cd 100644 --- a/common/patches/titanium_structs.h +++ b/common/patches/titanium_structs.h @@ -3334,14 +3334,14 @@ struct ExpeditionInfo_Struct struct ExpeditionMemberEntry_Struct { -/*000*/ char name[1]; // variable length, null terminated, max 0x40 (64) -/*000*/ uint8 status; // 0: unknown 1: Online, 2: Offline, 3: In Dynamic Zone, 4: Link Dead +/*000*/ char name[1]; // variable length, null terminated, max 0x40 (64) +/*000*/ uint8 expedition_status; // 0: unknown 1: Online, 2: Offline, 3: In Dynamic Zone, 4: Link Dead }; struct ExpeditionMemberList_Struct { /*000*/ uint32 client_id; -/*004*/ uint32 count; +/*004*/ uint32 member_count; /*008*/ ExpeditionMemberEntry_Struct members[0]; // variable length }; diff --git a/common/patches/uf.cpp b/common/patches/uf.cpp index 599272ad4..47dafbbf3 100644 --- a/common/patches/uf.cpp +++ b/common/patches/uf.cpp @@ -742,11 +742,11 @@ namespace UF SerializeBuffer buf; buf.WriteUInt32(emu->client_id); - buf.WriteUInt32(emu->count); - for (uint32 i = 0; i < emu->count; ++i) + buf.WriteUInt32(emu->member_count); + for (uint32 i = 0; i < emu->member_count; ++i) { buf.WriteString(emu->members[i].name); - buf.WriteUInt8(emu->members[i].status); + buf.WriteUInt8(emu->members[i].expedition_status); } __packet->size = buf.size(); @@ -771,7 +771,7 @@ namespace UF ENCODE(OP_DzMemberListStatus) { auto emu = reinterpret_cast((*p)->pBuffer); - if (emu->count == 1) + if (emu->member_count == 1) { ENCODE_FORWARD(OP_DzMemberList); } diff --git a/common/patches/uf_structs.h b/common/patches/uf_structs.h index 70c1c6cd1..4a4ac8a36 100644 --- a/common/patches/uf_structs.h +++ b/common/patches/uf_structs.h @@ -4289,14 +4289,14 @@ struct ExpeditionInfo_Struct struct ExpeditionMemberEntry_Struct { -/*000*/ char name[1]; // variable length, null terminated, max 0x40 (64) -/*000*/ uint8 status; // 0: unknown 1: Online, 2: Offline, 3: In Dynamic Zone, 4: Link Dead +/*000*/ char name[1]; // variable length, null terminated, max 0x40 (64) +/*000*/ uint8 expedition_status; // 0: unknown 1: Online, 2: Offline, 3: In Dynamic Zone, 4: Link Dead }; struct ExpeditionMemberList_Struct { /*000*/ uint32 client_id; -/*004*/ uint32 count; // number of players in window +/*004*/ uint32 member_count; // number of players in window /*008*/ ExpeditionMemberEntry_Struct members[0]; // variable length }; diff --git a/zone/expedition.cpp b/zone/expedition.cpp index 619006680..4d8966c76 100644 --- a/zone/expedition.cpp +++ b/zone/expedition.cpp @@ -1488,14 +1488,14 @@ std::unique_ptr Expedition::CreateMemberListPacket(bool cle auto outapp = std::unique_ptr(new EQApplicationPacket(OP_DzMemberList, outsize)); auto buf = reinterpret_cast(outapp->pBuffer); - buf->count = member_count; + buf->member_count = member_count; if (!clear) { for (auto i = 0; i < m_members.size(); ++i) { strn0cpy(buf->members[i].name, m_members[i].name.c_str(), sizeof(buf->members[i].name)); - buf->members[i].status = static_cast(m_members[i].status); + buf->members[i].expedition_status = static_cast(m_members[i].status); } } @@ -1520,11 +1520,11 @@ std::unique_ptr Expedition::CreateMemberListStatusPacket( uint32_t outsize = sizeof(ExpeditionMemberList_Struct) + sizeof(ExpeditionMemberEntry_Struct); auto outapp = std::unique_ptr(new EQApplicationPacket(OP_DzMemberListStatus, outsize)); auto buf = reinterpret_cast(outapp->pBuffer); - buf->count = 1; + buf->member_count = 1; auto entry = reinterpret_cast(buf->members); strn0cpy(entry->name, name.c_str(), sizeof(entry->name)); - entry->status = static_cast(status); + entry->expedition_status = static_cast(status); return outapp; }