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

Rename expedition packet fields

Browse Source
This commit is contained in:
hg 2020-10-17 22:39:38 -04:00
parent 022f82291a
commit b85feb5461
14 changed files with 49 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common/eq_packet_structs.h
View File

@ -4873,14 +4873,14 @@ struct ExpeditionInfo_Struct
struct ExpeditionMemberEntry_Struct struct ExpeditionMemberEntry_Struct
{ {
/*000*/ char name[64]; // variable length, null terminated, max 0x40 (64) /*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 /*064*/ uint8 expedition_status; // 0: unknown, 1: Online, 2: Offline, 3: In Dynamic Zone, 4: Link Dead
}; };
struct ExpeditionMemberList_Struct struct ExpeditionMemberList_Struct
{ {
/*000*/ uint32 client_id; /*000*/ uint32 client_id;
/*004*/ uint32 count; /*004*/ uint32 member_count;
/*008*/ ExpeditionMemberEntry_Struct members[0]; // variable length /*008*/ ExpeditionMemberEntry_Struct members[0]; // variable length
}; };

8
common/patches/rof.cpp
View File

@ -839,11 +839,11 @@ namespace RoF
SerializeBuffer buf; SerializeBuffer buf;
buf.WriteUInt32(emu->client_id); buf.WriteUInt32(emu->client_id);
buf.WriteUInt32(emu->count); buf.WriteUInt32(emu->member_count);
for (uint32 i = 0; i < emu->count; ++i) for (uint32 i = 0; i < emu->member_count; ++i)
{ {
buf.WriteString(emu->members[i].name); buf.WriteString(emu->members[i].name);
buf.WriteUInt8(emu->members[i].status); buf.WriteUInt8(emu->members[i].expedition_status);
} }
__packet->size = buf.size(); __packet->size = buf.size();
@ -868,7 +868,7 @@ namespace RoF
ENCODE(OP_DzMemberListStatus) ENCODE(OP_DzMemberListStatus)
{ {
auto emu = reinterpret_cast<ExpeditionMemberList_Struct*>((*p)->pBuffer); auto emu = reinterpret_cast<ExpeditionMemberList_Struct*>((*p)->pBuffer);
if (emu->count == 1) if (emu->member_count == 1)
{ {
ENCODE_FORWARD(OP_DzMemberList); ENCODE_FORWARD(OP_DzMemberList);
} }

8
common/patches/rof2.cpp
View File

@ -888,11 +888,11 @@ namespace RoF2
SerializeBuffer buf; SerializeBuffer buf;
buf.WriteUInt32(emu->client_id); buf.WriteUInt32(emu->client_id);
buf.WriteUInt32(emu->count); buf.WriteUInt32(emu->member_count);
for (uint32 i = 0; i < emu->count; ++i) for (uint32 i = 0; i < emu->member_count; ++i)
{ {
buf.WriteString(emu->members[i].name); buf.WriteString(emu->members[i].name);
buf.WriteUInt8(emu->members[i].status); buf.WriteUInt8(emu->members[i].expedition_status);
} }
__packet->size = buf.size(); __packet->size = buf.size();
@ -917,7 +917,7 @@ namespace RoF2
ENCODE(OP_DzMemberListStatus) ENCODE(OP_DzMemberListStatus)
{ {
auto emu = reinterpret_cast<ExpeditionMemberList_Struct*>((*p)->pBuffer); auto emu = reinterpret_cast<ExpeditionMemberList_Struct*>((*p)->pBuffer);
if (emu->count == 1) if (emu->member_count == 1)
{ {
ENCODE_FORWARD(OP_DzMemberList); ENCODE_FORWARD(OP_DzMemberList);
} }

6
common/patches/rof2_structs.h
View File

@ -4921,14 +4921,14 @@ struct ExpeditionInfo_Struct
struct ExpeditionMemberEntry_Struct struct ExpeditionMemberEntry_Struct
{ {
/*000*/ char name[1]; // variable length, null terminated, max 0x40 (64) /*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*/ uint8 expedition_status; // 0: unknown 1: Online, 2: Offline, 3: In Dynamic Zone, 4: Link Dead
}; };
struct ExpeditionMemberList_Struct struct ExpeditionMemberList_Struct
{ {
/*000*/ uint32 client_id; /*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 /*008*/ ExpeditionMemberEntry_Struct members[0]; // variable length
}; };

6
common/patches/rof_structs.h
View File

@ -4853,14 +4853,14 @@ struct ExpeditionInfo_Struct
struct ExpeditionMemberEntry_Struct struct ExpeditionMemberEntry_Struct
{ {
/*000*/ char name[1]; // variable length, null terminated, max 0x40 (64) /*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*/ uint8 expedition_status; // 0: unknown 1: Online, 2: Offline, 3: In Dynamic Zone, 4: Link Dead
}; };
struct ExpeditionMemberList_Struct struct ExpeditionMemberList_Struct
{ {
/*000*/ uint32 client_id; /*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 /*008*/ ExpeditionMemberEntry_Struct members[0]; // variable length
}; };

8
common/patches/sod.cpp
View File

@ -612,11 +612,11 @@ namespace SoD
SerializeBuffer buf; SerializeBuffer buf;
buf.WriteUInt32(emu->client_id); buf.WriteUInt32(emu->client_id);
buf.WriteUInt32(emu->count); buf.WriteUInt32(emu->member_count);
for (uint32 i = 0; i < emu->count; ++i) for (uint32 i = 0; i < emu->member_count; ++i)
{ {
buf.WriteString(emu->members[i].name); buf.WriteString(emu->members[i].name);
buf.WriteUInt8(emu->members[i].status); buf.WriteUInt8(emu->members[i].expedition_status);
} }
__packet->size = buf.size(); __packet->size = buf.size();
@ -641,7 +641,7 @@ namespace SoD
ENCODE(OP_DzMemberListStatus) ENCODE(OP_DzMemberListStatus)
{ {
auto emu = reinterpret_cast<ExpeditionMemberList_Struct*>((*p)->pBuffer); auto emu = reinterpret_cast<ExpeditionMemberList_Struct*>((*p)->pBuffer);
if (emu->count == 1) if (emu->member_count == 1)
{ {
ENCODE_FORWARD(OP_DzMemberList); ENCODE_FORWARD(OP_DzMemberList);
} }

6
common/patches/sod_structs.h
View File

@ -4208,14 +4208,14 @@ struct ExpeditionInfo_Struct
struct ExpeditionMemberEntry_Struct struct ExpeditionMemberEntry_Struct
{ {
/*000*/ char name[1]; // variable length, null terminated, max 0x40 (64) /*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*/ uint8 expedition_status; // 0: unknown 1: Online, 2: Offline, 3: In Dynamic Zone, 4: Link Dead
}; };
struct ExpeditionMemberList_Struct struct ExpeditionMemberList_Struct
{ {
/*000*/ uint32 client_id; /*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 /*008*/ ExpeditionMemberEntry_Struct members[0]; // variable length
}; };

8
common/patches/sof.cpp
View File

@ -600,11 +600,11 @@ namespace SoF
SerializeBuffer buf; SerializeBuffer buf;
buf.WriteUInt32(emu->client_id); buf.WriteUInt32(emu->client_id);
buf.WriteUInt32(emu->count); buf.WriteUInt32(emu->member_count);
for (uint32 i = 0; i < emu->count; ++i) for (uint32 i = 0; i < emu->member_count; ++i)
{ {
buf.WriteString(emu->members[i].name); buf.WriteString(emu->members[i].name);
buf.WriteUInt8(emu->members[i].status); buf.WriteUInt8(emu->members[i].expedition_status);
} }
__packet->size = buf.size(); __packet->size = buf.size();
@ -629,7 +629,7 @@ namespace SoF
ENCODE(OP_DzMemberListStatus) ENCODE(OP_DzMemberListStatus)
{ {
auto emu = reinterpret_cast<ExpeditionMemberList_Struct*>((*p)->pBuffer); auto emu = reinterpret_cast<ExpeditionMemberList_Struct*>((*p)->pBuffer);
if (emu->count == 1) if (emu->member_count == 1)
{ {
ENCODE_FORWARD(OP_DzMemberList); ENCODE_FORWARD(OP_DzMemberList);
} }

6
common/patches/sof_structs.h
View File

@ -4123,14 +4123,14 @@ struct ExpeditionInfo_Struct
struct ExpeditionMemberEntry_Struct struct ExpeditionMemberEntry_Struct
{ {
/*000*/ char name[1]; // variable length, null terminated, max 0x40 (64) /*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*/ uint8 expedition_status; // 0: unknown 1: Online, 2: Offline, 3: In Dynamic Zone, 4: Link Dead
}; };
struct ExpeditionMemberList_Struct struct ExpeditionMemberList_Struct
{ {
/*000*/ uint32 client_id; /*000*/ uint32 client_id;
/*004*/ uint32 count; /*004*/ uint32 member_count;
/*008*/ ExpeditionMemberEntry_Struct members[0]; // variable length /*008*/ ExpeditionMemberEntry_Struct members[0]; // variable length
}; };

8
common/patches/titanium.cpp
View File

@ -543,11 +543,11 @@ namespace Titanium
SerializeBuffer buf; SerializeBuffer buf;
buf.WriteUInt32(emu->client_id); buf.WriteUInt32(emu->client_id);
buf.WriteUInt32(emu->count); buf.WriteUInt32(emu->member_count);
for (uint32 i = 0; i < emu->count; ++i) for (uint32 i = 0; i < emu->member_count; ++i)
{ {
buf.WriteString(emu->members[i].name); buf.WriteString(emu->members[i].name);
buf.WriteUInt8(emu->members[i].status); buf.WriteUInt8(emu->members[i].expedition_status);
} }
__packet->size = buf.size(); __packet->size = buf.size();
@ -572,7 +572,7 @@ namespace Titanium
ENCODE(OP_DzMemberListStatus) ENCODE(OP_DzMemberListStatus)
{ {
auto emu = reinterpret_cast<ExpeditionMemberList_Struct*>((*p)->pBuffer); auto emu = reinterpret_cast<ExpeditionMemberList_Struct*>((*p)->pBuffer);
if (emu->count == 1) if (emu->member_count == 1)
{ {
ENCODE_FORWARD(OP_DzMemberList); ENCODE_FORWARD(OP_DzMemberList);
} }

6
common/patches/titanium_structs.h
View File

@ -3334,14 +3334,14 @@ struct ExpeditionInfo_Struct
struct ExpeditionMemberEntry_Struct struct ExpeditionMemberEntry_Struct
{ {
/*000*/ char name[1]; // variable length, null terminated, max 0x40 (64) /*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*/ uint8 expedition_status; // 0: unknown 1: Online, 2: Offline, 3: In Dynamic Zone, 4: Link Dead
}; };
struct ExpeditionMemberList_Struct struct ExpeditionMemberList_Struct
{ {
/*000*/ uint32 client_id; /*000*/ uint32 client_id;
/*004*/ uint32 count; /*004*/ uint32 member_count;
/*008*/ ExpeditionMemberEntry_Struct members[0]; // variable length /*008*/ ExpeditionMemberEntry_Struct members[0]; // variable length
}; };

8
common/patches/uf.cpp
View File

@ -742,11 +742,11 @@ namespace UF
SerializeBuffer buf; SerializeBuffer buf;
buf.WriteUInt32(emu->client_id); buf.WriteUInt32(emu->client_id);
buf.WriteUInt32(emu->count); buf.WriteUInt32(emu->member_count);
for (uint32 i = 0; i < emu->count; ++i) for (uint32 i = 0; i < emu->member_count; ++i)
{ {
buf.WriteString(emu->members[i].name); buf.WriteString(emu->members[i].name);
buf.WriteUInt8(emu->members[i].status); buf.WriteUInt8(emu->members[i].expedition_status);
} }
__packet->size = buf.size(); __packet->size = buf.size();
@ -771,7 +771,7 @@ namespace UF
ENCODE(OP_DzMemberListStatus) ENCODE(OP_DzMemberListStatus)
{ {
auto emu = reinterpret_cast<ExpeditionMemberList_Struct*>((*p)->pBuffer); auto emu = reinterpret_cast<ExpeditionMemberList_Struct*>((*p)->pBuffer);
if (emu->count == 1) if (emu->member_count == 1)
{ {
ENCODE_FORWARD(OP_DzMemberList); ENCODE_FORWARD(OP_DzMemberList);
} }

6
common/patches/uf_structs.h
View File

@ -4289,14 +4289,14 @@ struct ExpeditionInfo_Struct
struct ExpeditionMemberEntry_Struct struct ExpeditionMemberEntry_Struct
{ {
/*000*/ char name[1]; // variable length, null terminated, max 0x40 (64) /*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*/ uint8 expedition_status; // 0: unknown 1: Online, 2: Offline, 3: In Dynamic Zone, 4: Link Dead
}; };
struct ExpeditionMemberList_Struct struct ExpeditionMemberList_Struct
{ {
/*000*/ uint32 client_id; /*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 /*008*/ ExpeditionMemberEntry_Struct members[0]; // variable length
}; };

8
zone/expedition.cpp
View File

@ -1488,14 +1488,14 @@ std::unique_ptr<EQApplicationPacket> Expedition::CreateMemberListPacket(bool cle
auto outapp = std::unique_ptr<EQApplicationPacket>(new EQApplicationPacket(OP_DzMemberList, outsize)); auto outapp = std::unique_ptr<EQApplicationPacket>(new EQApplicationPacket(OP_DzMemberList, outsize));
auto buf = reinterpret_cast<ExpeditionMemberList_Struct*>(outapp->pBuffer); auto buf = reinterpret_cast<ExpeditionMemberList_Struct*>(outapp->pBuffer);
buf->count = member_count; buf->member_count = member_count;
if (!clear) if (!clear)
{ {
for (auto i = 0; i < m_members.size(); ++i) 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)); strn0cpy(buf->members[i].name, m_members[i].name.c_str(), sizeof(buf->members[i].name));
buf->members[i].status = static_cast<uint8_t>(m_members[i].status); buf->members[i].expedition_status = static_cast<uint8_t>(m_members[i].status);
} }
} }
@ -1520,11 +1520,11 @@ std::unique_ptr<EQApplicationPacket> Expedition::CreateMemberListStatusPacket(
uint32_t outsize = sizeof(ExpeditionMemberList_Struct) + sizeof(ExpeditionMemberEntry_Struct); uint32_t outsize = sizeof(ExpeditionMemberList_Struct) + sizeof(ExpeditionMemberEntry_Struct);
auto outapp = std::unique_ptr<EQApplicationPacket>(new EQApplicationPacket(OP_DzMemberListStatus, outsize)); auto outapp = std::unique_ptr<EQApplicationPacket>(new EQApplicationPacket(OP_DzMemberListStatus, outsize));
auto buf = reinterpret_cast<ExpeditionMemberList_Struct*>(outapp->pBuffer); auto buf = reinterpret_cast<ExpeditionMemberList_Struct*>(outapp->pBuffer);
buf->count = 1; buf->member_count = 1;
auto entry = reinterpret_cast<ExpeditionMemberEntry_Struct*>(buf->members); auto entry = reinterpret_cast<ExpeditionMemberEntry_Struct*>(buf->members);
strn0cpy(entry->name, name.c_str(), sizeof(entry->name)); strn0cpy(entry->name, name.c_str(), sizeof(entry->name));
entry->status = static_cast<uint8_t>(status); entry->expedition_status = static_cast<uint8_t>(status);
return outapp; return outapp;
} }