incentive/psopeeps-newserv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refine 6x70 format to enable all cross-version joins

Browse Source
This commit is contained in:
Martin Michelsen
2023-12-29 10:44:25 -08:00
parent 60f6b609da
commit 4f2432cbac
5 changed files with 467 additions and 285 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/CommandFormats.hh
+69 -72
View File
@@ -4698,46 +4698,61 @@ struct G_SetQuestFlags_6x6F {
// and instead rearranged a bunch of things. // and instead rearranged a bunch of things.
struct Telepipe { struct Telepipe {
/* 00 */ le_uint16_t client_id; /* 00 */ le_uint16_t client_id = 0xFFFF;
/* 02 */ le_uint16_t unknown_a1; /* 02 */ le_uint16_t unknown_a1 = 0;
/* 04 */ le_uint32_t unknown_a2; /* 04 */ le_uint32_t unknown_a2 = 0;
/* 08 */ le_float x; /* 08 */ le_float x = 0.0f;
/* 0C */ le_float y; /* 0C */ le_float y = 0.0f;
/* 10 */ le_float z; /* 10 */ le_float z = 0.0f;
/* 14 */ le_uint32_t unknown_a3; /* 14 */ le_uint32_t unknown_a3 = 0;
/* 18 */ parray<uint8_t, 4> unknown_a4; /* 18 */ le_uint32_t unknown_a4 = 0x0000FFFF;
/* 1C */ /* 1C */
} __packed__; } __packed__;
struct G_Unknown_6x70_Sub { struct G_Unknown_6x70_SubA1 {
// This is used in all versions of this command except DCNTE and 11/2000. // This is used in all versions of this command except DCNTE and 11/2000.
/* 00 */ le_uint16_t unknown_a1; /* 00 */ le_uint16_t unknown_a1 = 0;
/* 02 */ le_uint16_t unknown_a2; /* 02 */ le_uint16_t unknown_a2 = 0;
/* 04 */ le_uint32_t unknown_a3; /* 04 */ le_uint32_t unknown_a3 = 0;
/* 08 */ le_uint32_t unknown_a4; /* 08 */ le_float unknown_a4 = 0.0f;
/* 0C */ le_uint32_t unknown_a5; /* 0C */ le_uint32_t unknown_a5 = 0;
/* 10 */ le_uint32_t unknown_a6; /* 10 */ le_uint32_t unknown_a6 = 0;
/* 14 */ /* 14 */
} __packed__; } __packed__;
struct G_Unknown_6x70_SubA2 {
// This is used in all versions of this command except DCNTE and 11/2000.
/* 00 */ le_uint32_t unknown_a1 = 0;
/* 04 */ le_float unknown_a2 = 0.0f;
/* 08 */ le_uint32_t unknown_a3 = 0;
/* 0C */
} __packed__;
struct G_SyncPlayerDispAndInventory_BaseDCNTE {
/* 0000 */ le_uint16_t client_id = 0;
/* 0002 */ le_uint16_t unknown_a1 = 0;
/* 0004 */ le_uint32_t flags1 = 0;
/* 0008 */ le_float x = 0.0f;
/* 000C */ le_float y = 0.0f;
/* 0010 */ le_float z = 0.0f;
/* 0014 */ le_uint32_t angle_x = 0;
/* 0018 */ le_uint32_t angle_y = 0;
/* 001C */ le_uint32_t angle_z = 0;
/* 0020 */ le_uint16_t unknown_a3a = 0;
/* 0022 */ le_uint16_t current_hp = 0;
} __packed__;
struct G_SyncPlayerDispAndInventory_DCNTE_6x70 { struct G_SyncPlayerDispAndInventory_DCNTE_6x70 {
// Offsets in this struct are relative to the overall command header // Offsets in this struct are relative to the overall command header
/* 0004 */ G_ExtendedHeader<G_UnusedHeader> header = {{0x70, 0x00, 0x0000}, sizeof(G_SyncPlayerDispAndInventory_DCNTE_6x70)}; /* 0004 */ G_ExtendedHeader<G_ClientIDHeader> header = {{0x60, 0x00, 0x0000}, sizeof(G_SyncPlayerDispAndInventory_DCNTE_6x70)};
/* 000C */ le_uint16_t client_id = 0; /* 000C */ G_SyncPlayerDispAndInventory_BaseDCNTE base;
/* 000E */ le_uint16_t unknown_a1 = 0; // The following two fields appear to contain uninitialized data
/* 0010 */ le_uint32_t flags1; /* 0030 */ le_uint32_t unknown_a5 = 0;
/* 0014 */ le_float x; /* 0034 */ le_uint32_t unknown_a6 = 0;
/* 0018 */ le_float y;
/* 001C */ le_float z;
/* 0020 */ le_uint32_t angle_x;
/* 0024 */ le_uint32_t angle_y;
/* 0028 */ le_uint32_t angle_z;
/* 002C */ le_uint16_t unknown_a3a;
/* 002E */ le_uint16_t current_hp;
/* 0030 */ le_uint32_t unknown_a5;
/* 0034 */ le_uint32_t unknown_a6;
/* 0038 */ Telepipe telepipe; /* 0038 */ Telepipe telepipe;
/* 0054 */ parray<uint8_t, 0x18> unknown_a7; /* 0054 */ le_uint32_t unknown_a8 = 0;
/* 0058 */ parray<uint8_t, 0x10> unknown_a9;
/* 0068 */ le_uint32_t area = 0;
/* 006C */ le_uint32_t flags2 = 0; /* 006C */ le_uint32_t flags2 = 0;
/* 0070 */ PlayerVisualConfig visual; /* 0070 */ PlayerVisualConfig visual;
/* 00C0 */ PlayerStats stats; /* 00C0 */ PlayerStats stats;
@@ -4748,23 +4763,15 @@ struct G_SyncPlayerDispAndInventory_DCNTE_6x70 {
struct G_SyncPlayerDispAndInventory_DC112000_6x70 { struct G_SyncPlayerDispAndInventory_DC112000_6x70 {
// Offsets in this struct are relative to the overall command header // Offsets in this struct are relative to the overall command header
/* 0004 */ G_ExtendedHeader<G_UnusedHeader> header = {{0x70, 0x00, 0x0000}, sizeof(G_SyncPlayerDispAndInventory_DC112000_6x70)}; /* 0004 */ G_ExtendedHeader<G_ClientIDHeader> header = {{0x67, 0x00, 0x0000}, sizeof(G_SyncPlayerDispAndInventory_DC112000_6x70)};
/* 000C */ le_uint16_t client_id = 0; /* 000C */ G_SyncPlayerDispAndInventory_BaseDCNTE base;
/* 000E */ le_uint16_t unknown_a1 = 0; /* 0030 */ le_uint16_t bonus_hp_from_materials = 0;
/* 0010 */ le_uint32_t flags1; /* 0032 */ le_uint16_t bonus_tp_from_materials = 0;
/* 0014 */ le_float x;
/* 0018 */ le_float y;
/* 001C */ le_float z;
/* 0020 */ le_uint32_t angle_x;
/* 0024 */ le_uint32_t angle_y;
/* 0028 */ le_uint32_t angle_z;
/* 002C */ le_uint16_t unknown_a3a;
/* 002E */ le_uint16_t current_hp;
/* 0030 */ le_uint16_t bonus_hp_from_materials;
/* 0032 */ le_uint16_t bonus_tp_from_materials;
/* 0034 */ parray<uint8_t, 0x10> unknown_a5; /* 0034 */ parray<uint8_t, 0x10> unknown_a5;
/* 0044 */ Telepipe telepipe; /* 0044 */ Telepipe telepipe;
/* 0060 */ parray<uint8_t, 0x18> unknown_a6; /* 0060 */ le_uint32_t unknown_a8 = 0;
/* 0064 */ parray<uint8_t, 0x10> unknown_a9;
/* 0074 */ le_uint32_t area = 0;
/* 0078 */ le_uint32_t flags2 = 0; /* 0078 */ le_uint32_t flags2 = 0;
/* 007C */ PlayerVisualConfig visual; /* 007C */ PlayerVisualConfig visual;
/* 00CC */ PlayerStats stats; /* 00CC */ PlayerStats stats;
@@ -4773,40 +4780,30 @@ struct G_SyncPlayerDispAndInventory_DC112000_6x70 {
/* 043C */ /* 043C */
} __packed__; } __packed__;
struct G_SyncPlayerDispAndInventory_Base { struct G_SyncPlayerDispAndInventory_BaseV1 {
/* 0000 */ le_uint16_t client_id = 0; /* 0000 */ G_SyncPlayerDispAndInventory_BaseDCNTE base;
/* 0002 */ le_uint16_t unknown_a1 = 0; /* 0024 */ le_uint16_t bonus_hp_from_materials = 0;
/* 0004 */ le_uint32_t flags1; /* 0026 */ le_uint16_t bonus_tp_from_materials = 0;
/* 0008 */ le_float x; /* 0028 */ parray<G_Unknown_6x70_SubA2, 5> unknown_a4;
/* 000C */ le_float y;
/* 0010 */ le_float z;
/* 0014 */ le_uint32_t angle_x;
/* 0018 */ le_uint32_t angle_y;
/* 001C */ le_uint32_t angle_z;
/* 0020 */ le_uint16_t unknown_a3a;
/* 0022 */ le_uint16_t current_hp;
/* 0024 */ le_uint16_t bonus_hp_from_materials;
/* 0026 */ le_uint16_t bonus_tp_from_materials;
/* 0028 */ parray<parray<le_uint32_t, 3>, 5> unknown_a4;
/* 0064 */ le_uint32_t language = 0; /* 0064 */ le_uint32_t language = 0;
/* 0068 */ le_uint32_t player_tag = 0; /* 0068 */ le_uint32_t player_tag = 0;
/* 006C */ le_uint32_t guild_card_number = 0; /* 006C */ le_uint32_t guild_card_number = 0;
/* 0070 */ le_uint32_t unknown_a6; /* 0070 */ le_uint32_t unknown_a6 = 0;
/* 0074 */ le_uint32_t battle_team_number; /* 0074 */ le_uint32_t battle_team_number = 0;
/* 0078 */ Telepipe telepipe; /* 0078 */ Telepipe telepipe;
/* 0094 */ le_uint32_t unknown_a8 = 0; /* 0094 */ le_uint32_t unknown_a8 = 0;
/* 0098 */ G_Unknown_6x70_Sub unknown_a9; /* 0098 */ G_Unknown_6x70_SubA1 unknown_a9;
/* 00AC */ le_uint32_t area = 0; /* 00AC */ le_uint32_t area = 0;
/* 00B0 */ le_uint32_t flags2 = 0; /* 00B0 */ le_uint32_t flags2 = 0;
/* 00B4 */ parray<uint8_t, 0x14> technique_levels_v1; // Last byte is uninitialized /* 00B4 */ parray<uint8_t, 0x14> technique_levels_v1 = 0xFF; // Last byte is uninitialized
/* 00C8 */ PlayerVisualConfig visual; /* 00C8 */ PlayerVisualConfig visual;
/* 0118 */ /* 0118 */
} __packed__; } __packed__;
struct G_SyncPlayerDispAndInventory_DC_PC_6x70 { struct G_SyncPlayerDispAndInventory_DC_PC_6x70 {
// Offsets in this struct are relative to the overall command header // Offsets in this struct are relative to the overall command header
/* 0004 */ G_ExtendedHeader<G_UnusedHeader> header = {{0x70, 0x00, 0x0000}, sizeof(G_SyncPlayerDispAndInventory_DC_PC_6x70)}; /* 0004 */ G_ExtendedHeader<G_ClientIDHeader> header = {{0x70, 0x00, 0x0000}, sizeof(G_SyncPlayerDispAndInventory_DC_PC_6x70)};
/* 000C */ G_SyncPlayerDispAndInventory_Base base; /* 000C */ G_SyncPlayerDispAndInventory_BaseV1 base;
/* 0124 */ PlayerStats stats; /* 0124 */ PlayerStats stats;
/* 0148 */ le_uint32_t num_items = 0; /* 0148 */ le_uint32_t num_items = 0;
/* 014C */ parray<PlayerInventoryItem, 0x1E> items; /* 014C */ parray<PlayerInventoryItem, 0x1E> items;
@@ -4816,8 +4813,8 @@ struct G_SyncPlayerDispAndInventory_DC_PC_6x70 {
// GC NTE also uses this format. // GC NTE also uses this format.
struct G_SyncPlayerDispAndInventory_GC_6x70 { struct G_SyncPlayerDispAndInventory_GC_6x70 {
// Offsets in this struct are relative to the overall command header // Offsets in this struct are relative to the overall command header
/* 0004 */ G_ExtendedHeader<G_UnusedHeader> header = {{0x70, 0x00, 0x0000}, sizeof(G_SyncPlayerDispAndInventory_GC_6x70)}; /* 0004 */ G_ExtendedHeader<G_ClientIDHeader> header = {{0x70, 0x00, 0x0000}, sizeof(G_SyncPlayerDispAndInventory_GC_6x70)};
/* 000C */ G_SyncPlayerDispAndInventory_Base base; /* 000C */ G_SyncPlayerDispAndInventory_BaseV1 base;
/* 0124 */ PlayerStats stats; /* 0124 */ PlayerStats stats;
/* 0148 */ le_uint32_t num_items = 0; /* 0148 */ le_uint32_t num_items = 0;
/* 014C */ parray<PlayerInventoryItem, 0x1E> items; /* 014C */ parray<PlayerInventoryItem, 0x1E> items;
@@ -4827,8 +4824,8 @@ struct G_SyncPlayerDispAndInventory_GC_6x70 {
struct G_SyncPlayerDispAndInventory_XB_6x70 { struct G_SyncPlayerDispAndInventory_XB_6x70 {
// Offsets in this struct are relative to the overall command header // Offsets in this struct are relative to the overall command header
/* 0004 */ G_ExtendedHeader<G_UnusedHeader> header = {{0x70, 0x00, 0x0000}, sizeof(G_SyncPlayerDispAndInventory_XB_6x70)}; /* 0004 */ G_ExtendedHeader<G_ClientIDHeader> header = {{0x70, 0x00, 0x0000}, sizeof(G_SyncPlayerDispAndInventory_XB_6x70)};
/* 000C */ G_SyncPlayerDispAndInventory_Base base; /* 000C */ G_SyncPlayerDispAndInventory_BaseV1 base;
/* 0124 */ PlayerStats stats; /* 0124 */ PlayerStats stats;
/* 0148 */ le_uint32_t num_items = 0; /* 0148 */ le_uint32_t num_items = 0;
/* 014C */ parray<PlayerInventoryItem, 0x1E> items; /* 014C */ parray<PlayerInventoryItem, 0x1E> items;
@@ -4841,8 +4838,8 @@ struct G_SyncPlayerDispAndInventory_XB_6x70 {
struct G_SyncPlayerDispAndInventory_BB_6x70 { struct G_SyncPlayerDispAndInventory_BB_6x70 {
// Offsets in this struct are relative to the overall command header // Offsets in this struct are relative to the overall command header
/* 0008 */ G_ExtendedHeader<G_UnusedHeader> header = {{0x70, 0x00, 0x0000}, sizeof(G_SyncPlayerDispAndInventory_BB_6x70)}; /* 0008 */ G_ExtendedHeader<G_ClientIDHeader> header = {{0x70, 0x00, 0x0000}, sizeof(G_SyncPlayerDispAndInventory_BB_6x70)};
/* 0010 */ G_SyncPlayerDispAndInventory_Base base; /* 0010 */ G_SyncPlayerDispAndInventory_BaseV1 base;
/* 0128 */ pstring<TextEncoding::UTF16, 0x10> name; /* 0128 */ pstring<TextEncoding::UTF16, 0x10> name;
/* 0148 */ PlayerStats stats; /* 0148 */ PlayerStats stats;
/* 016C */ le_uint32_t num_items = 0; /* 016C */ le_uint32_t num_items = 0;
src/PlayerSubordinates.cc
+32 -25
View File
@@ -44,7 +44,7 @@ void PlayerVisualConfig::compute_name_color_checksum() {
this->name_color_checksum = this->compute_name_color_checksum(this->name_color); this->name_color_checksum = this->compute_name_color_checksum(this->name_color);
} }
void PlayerDispDataDCPCV3::enforce_lobby_join_limits_for_client(shared_ptr<Client> c) { void PlayerVisualConfig::enforce_lobby_join_limits_for_version(Version v) {
struct ClassMaxes { struct ClassMaxes {
uint16_t costume; uint16_t costume;
uint16_t skin; uint16_t skin;
@@ -90,9 +90,9 @@ void PlayerDispDataDCPCV3::enforce_lobby_join_limits_for_client(shared_ptr<Clien
{0x0000, 0x0000, 0x0000, 0x0000, 0x0000}}; {0x0000, 0x0000, 0x0000, 0x0000, 0x0000}};
const ClassMaxes* maxes; const ClassMaxes* maxes;
if (is_v1_or_v2(c->version())) { if (is_v1_or_v2(v)) {
// V1/V2 have fewer classes, so we'll substitute some here // V1/V2 have fewer classes, so we'll substitute some here
switch (this->visual.char_class) { switch (this->char_class) {
case 0: // HUmar case 0: // HUmar
case 1: // HUnewearl case 1: // HUnewearl
case 2: // HUcast case 2: // HUcast
@@ -106,53 +106,60 @@ void PlayerDispDataDCPCV3::enforce_lobby_join_limits_for_client(shared_ptr<Clien
case 13: // V3 custom 2 case 13: // V3 custom 2
break; break;
case 9: // HUcaseal case 9: // HUcaseal
this->visual.char_class = 5; // HUcaseal -> RAcaseal this->char_class = 5; // HUcaseal -> RAcaseal
break; break;
case 10: // FOmar case 10: // FOmar
this->visual.char_class = 0; // FOmar -> HUmar this->char_class = 0; // FOmar -> HUmar
break; break;
case 11: // RAmarl case 11: // RAmarl
this->visual.char_class = 1; // RAmarl -> HUnewearl this->char_class = 1; // RAmarl -> HUnewearl
break; break;
case 14: // V2 custom 1 / V3 custom 3 case 14: // V2 custom 1 / V3 custom 3
case 15: // V2 custom 2 / V3 custom 4 case 15: // V2 custom 2 / V3 custom 4
case 16: // V2 custom 3 / V3 custom 5 case 16: // V2 custom 3 / V3 custom 5
case 17: // V2 custom 4 / V3 custom 6 case 17: // V2 custom 4 / V3 custom 6
case 18: // V2 custom 5 / V3 custom 7 case 18: // V2 custom 5 / V3 custom 7
this->visual.char_class -= 5; this->char_class -= 5;
break; break;
default: default:
this->visual.char_class = 0; // Invalid classes -> HUmar this->char_class = 0; // Invalid classes -> HUmar
} }
this->visual.version = min<uint8_t>(this->visual.version, is_v1(c->version()) ? 0 : 2); this->version = min<uint8_t>(this->version, is_v1(v) ? 0 : 2);
maxes = &v1_v2_class_maxes[this->visual.char_class]; maxes = &v1_v2_class_maxes[this->char_class];
} else { } else {
if (this->visual.char_class >= 19) { if (this->char_class >= 19) {
this->visual.char_class = 0; // Invalid classes -> HUmar this->char_class = 0; // Invalid classes -> HUmar
} }
this->visual.version = min<uint8_t>(this->visual.version, 3); this->version = min<uint8_t>(this->version, 3);
maxes = &v3_v4_class_maxes[this->visual.char_class]; maxes = &v3_v4_class_maxes[this->char_class];
} }
// V1/V2 has fewer costumes and android skins, so substitute them here // V1/V2 has fewer costumes and android skins, so substitute them here
this->visual.costume = maxes->costume ? (this->visual.costume % maxes->costume) : 0; this->costume = maxes->costume ? (this->costume % maxes->costume) : 0;
this->visual.skin = maxes->skin ? (this->visual.skin % maxes->skin) : 0; this->skin = maxes->skin ? (this->skin % maxes->skin) : 0;
this->visual.face = maxes->face ? (this->visual.face % maxes->face) : 0; this->face = maxes->face ? (this->face % maxes->face) : 0;
this->visual.head = maxes->head ? (this->visual.head % maxes->head) : 0; this->head = maxes->head ? (this->head % maxes->head) : 0;
this->visual.hair = maxes->hair ? (this->visual.hair % maxes->hair) : 0; this->hair = maxes->hair ? (this->hair % maxes->hair) : 0;
this->visual.compute_name_color_checksum(); if (is_v1_or_v2(v)) {
this->visual.class_flags = class_flags_for_class(this->visual.char_class); this->compute_name_color_checksum();
}
this->class_flags = class_flags_for_class(this->char_class);
if (this->visual.name.at(0) == '\t' && (this->visual.name.at(1) == 'J' || this->visual.name.at(1) == 'E')) { if (is_v4(v) && (this->name.at(0) == '\t') && (this->name.at(1) == 'J' || this->name.at(1) == 'E')) {
this->visual.name.encode(this->visual.name.decode().substr(2)); this->name.encode(this->name.decode().substr(2));
} }
} }
void PlayerDispDataBB::enforce_lobby_join_limits_for_client(shared_ptr<Client> c) { void PlayerDispDataDCPCV3::enforce_lobby_join_limits_for_version(Version v) {
if (!is_v4(c->version())) { this->visual.enforce_lobby_join_limits_for_version(v);
}
void PlayerDispDataBB::enforce_lobby_join_limits_for_version(Version v) {
this->visual.enforce_lobby_join_limits_for_version(v);
if (!is_v4(v)) {
throw logic_error("PlayerDispDataBB being sent to non-BB client"); throw logic_error("PlayerDispDataBB being sent to non-BB client");
} }
this->play_time = 0; this->play_time = 0;
src/PlayerSubordinates.hh
+4 -2
View File
@@ -152,6 +152,8 @@ struct PlayerVisualConfig {
static uint32_t compute_name_color_checksum(uint32_t name_color); static uint32_t compute_name_color_checksum(uint32_t name_color);
void compute_name_color_checksum(); void compute_name_color_checksum();
void enforce_lobby_join_limits_for_version(Version v);
} __attribute__((packed)); } __attribute__((packed));
struct PlayerDispDataDCPCV3 { struct PlayerDispDataDCPCV3 {
@@ -161,7 +163,7 @@ struct PlayerDispDataDCPCV3 {
/* BC */ parray<uint8_t, 0x14> technique_levels_v1; /* BC */ parray<uint8_t, 0x14> technique_levels_v1;
/* D0 */ /* D0 */
void enforce_lobby_join_limits_for_client(std::shared_ptr<Client> c); void enforce_lobby_join_limits_for_version(Version v);
PlayerDispDataBB to_bb(uint8_t to_language, uint8_t from_language) const; PlayerDispDataBB to_bb(uint8_t to_language, uint8_t from_language) const;
} __attribute__((packed)); } __attribute__((packed));
@@ -187,7 +189,7 @@ struct PlayerDispDataBB {
/* 017C */ parray<uint8_t, 0x14> technique_levels_v1; /* 017C */ parray<uint8_t, 0x14> technique_levels_v1;
/* 0190 */ /* 0190 */
void enforce_lobby_join_limits_for_client(std::shared_ptr<Client> c); void enforce_lobby_join_limits_for_version(Version v);
PlayerDispDataDCPCV3 to_dcpcv3(uint8_t to_language, uint8_t from_language) const; PlayerDispDataDCPCV3 to_dcpcv3(uint8_t to_language, uint8_t from_language) const;
PlayerDispDataBBPreview to_preview() const; PlayerDispDataBBPreview to_preview() const;
void apply_preview(const PlayerDispDataBBPreview&); void apply_preview(const PlayerDispDataBBPreview&);
src/ReceiveSubcommands.cc
+349 -177
View File
@@ -5,6 +5,7 @@
#include <memory> #include <memory>
#include <phosg/Random.hh> #include <phosg/Random.hh>
#include <phosg/Strings.hh> #include <phosg/Strings.hh>
#include <phosg/Vector.hh>
#include "Client.hh" #include "Client.hh"
#include "Compression.hh" #include "Compression.hh"
@@ -127,7 +128,7 @@ static void forward_subcommand(shared_ptr<Client> c, uint8_t command, uint8_t fl
Version c_version = c->version(); Version c_version = c->version();
auto send_to_client = [&](shared_ptr<Client> lc) -> void { auto send_to_client = [&](shared_ptr<Client> lc) -> void {
Version lc_version = lc->version(); Version lc_version = lc->version();
if (l->is_game() || (!is_pre_v1(lc_version) && !is_pre_v1(c_version)) || (lc_version == c_version)) { if ((!is_pre_v1(lc_version) && !is_pre_v1(c_version)) || (lc_version == c_version)) {
send_command(lc, command, flag, data, size); send_command(lc, command, flag, data, size);
} else if (lc->version() == Version::DC_NTE) { } else if (lc->version() == Version::DC_NTE) {
if (def->nte_subcommand) { if (def->nte_subcommand) {
@@ -205,7 +206,7 @@ static void forward_subcommand(shared_ptr<Client> c, uint8_t command, uint8_t fl
for (const auto& watcher_lobby : l->watcher_lobbies) { for (const auto& watcher_lobby : l->watcher_lobbies) {
for (auto& target : watcher_lobby->clients) { for (auto& target : watcher_lobby->clients) {
if (target && is_ep3(target->version())) { if (target && is_ep3(target->version())) {
send_command(target, command, flag, data, size); send_to_client(target);
} }
} }
} }
@@ -402,6 +403,320 @@ static void on_sync_joining_player_item_state(shared_ptr<Client> c, uint8_t comm
send_game_item_state(target); send_game_item_state(target);
} }
template <typename CmdT>
void clear_dc_protos_unused_6x70_item_fields(CmdT& cmd) {
for (size_t z = 0; z < min<uint32_t>(cmd.num_items, 30); z++) {
auto& item = cmd.items[z];
item.unknown_a1 = 0;
item.extension_data1 = 0;
item.extension_data2 = 0;
}
}
class Parsed6x70Data {
public:
G_SyncPlayerDispAndInventory_BaseDCNTE base;
uint32_t unknown_a5_nte = 0;
uint32_t unknown_a6_nte = 0;
uint16_t bonus_hp_from_materials = 0;
uint16_t bonus_tp_from_materials = 0;
parray<uint8_t, 0x10> unknown_a5_112000;
parray<G_Unknown_6x70_SubA2, 5> unknown_a4_final;
uint32_t language = 0;
uint32_t player_tag = 0;
uint32_t guild_card_number = 0;
uint32_t unknown_a6 = 0;
uint32_t battle_team_number = 0;
Telepipe telepipe;
uint32_t unknown_a8 = 0;
parray<uint8_t, 0x10> unknown_a9_nte_112000;
G_Unknown_6x70_SubA1 unknown_a9_final;
uint32_t area = 0;
uint32_t flags2 = 0;
parray<uint8_t, 0x14> technique_levels_v1 = 0xFF;
PlayerVisualConfig visual;
std::string name;
PlayerStats stats;
uint32_t num_items = 0;
parray<PlayerInventoryItem, 0x1E> items;
uint32_t floor = 0;
uint64_t xb_user_id = 0;
uint32_t xb_unknown_a16 = 0;
Parsed6x70Data(const G_SyncPlayerDispAndInventory_DCNTE_6x70& cmd, uint32_t guild_card_number)
: base(cmd.base),
unknown_a5_nte(cmd.unknown_a5),
unknown_a6_nte(cmd.unknown_a6),
bonus_hp_from_materials(0),
bonus_tp_from_materials(0),
language(0),
player_tag(0x00010000),
guild_card_number(guild_card_number),
unknown_a6(0),
battle_team_number(0),
telepipe(cmd.telepipe),
unknown_a8(cmd.unknown_a8),
unknown_a9_nte_112000(cmd.unknown_a9),
area(cmd.area),
flags2(cmd.flags2),
visual(cmd.visual),
stats(cmd.stats),
num_items(cmd.num_items),
items(cmd.items),
floor(cmd.area),
xb_user_id(this->default_xb_user_id()),
xb_unknown_a16(0) {
this->name = this->visual.name.decode(this->language);
}
Parsed6x70Data(const G_SyncPlayerDispAndInventory_DC112000_6x70& cmd, uint32_t guild_card_number, uint8_t language)
: base(cmd.base),
unknown_a5_nte(0),
unknown_a6_nte(0),
bonus_hp_from_materials(cmd.bonus_hp_from_materials),
bonus_tp_from_materials(cmd.bonus_tp_from_materials),
unknown_a5_112000(cmd.unknown_a5),
language(language),
player_tag(0x00010000),
guild_card_number(guild_card_number),
unknown_a6(0),
battle_team_number(0),
telepipe(cmd.telepipe),
unknown_a8(cmd.unknown_a8),
unknown_a9_nte_112000(cmd.unknown_a9),
area(cmd.area),
flags2(cmd.flags2),
visual(cmd.visual),
stats(cmd.stats),
num_items(cmd.num_items),
items(cmd.items),
floor(cmd.area),
xb_user_id(this->default_xb_user_id()),
xb_unknown_a16(0) {
this->name = this->visual.name.decode(this->language);
}
Parsed6x70Data(const G_SyncPlayerDispAndInventory_DC_PC_6x70& cmd, uint32_t guild_card_number)
: Parsed6x70Data(cmd.base, guild_card_number) {
this->stats = cmd.stats;
this->num_items = cmd.num_items;
this->items = cmd.items;
this->floor = cmd.base.area;
this->xb_user_id = this->default_xb_user_id();
this->xb_unknown_a16 = 0;
this->name = this->visual.name.decode(this->language);
}
Parsed6x70Data(const G_SyncPlayerDispAndInventory_GC_6x70& cmd, uint32_t guild_card_number)
: Parsed6x70Data(cmd.base, guild_card_number) {
this->stats = cmd.stats;
this->num_items = cmd.num_items;
this->items = cmd.items;
this->floor = cmd.floor;
this->xb_user_id = this->default_xb_user_id();
this->xb_unknown_a16 = 0;
this->name = this->visual.name.decode(this->language);
}
Parsed6x70Data(const G_SyncPlayerDispAndInventory_XB_6x70& cmd, uint32_t guild_card_number)
: Parsed6x70Data(cmd.base, guild_card_number) {
this->stats = cmd.stats;
this->num_items = cmd.num_items;
this->items = cmd.items;
this->floor = cmd.floor;
this->xb_user_id = (static_cast<uint64_t>(cmd.xb_user_id_high) << 32) | cmd.xb_user_id_low;
this->xb_unknown_a16 = cmd.unknown_a16;
this->name = this->visual.name.decode(this->language);
}
Parsed6x70Data(const G_SyncPlayerDispAndInventory_BB_6x70& cmd, uint32_t guild_card_number)
: Parsed6x70Data(cmd.base, guild_card_number) {
this->stats = cmd.stats;
this->num_items = cmd.num_items;
this->items = cmd.items;
this->floor = cmd.floor;
this->xb_user_id = this->default_xb_user_id();
this->xb_unknown_a16 = cmd.unknown_a16;
this->name = cmd.name.decode(cmd.base.language);
if ((this->name.size() > 2) && (this->name[0] == '\t') && ((this->name[1] == 'E') || (this->name[1] == 'J'))) {
this->name = this->name.substr(2);
}
this->visual.name.encode(this->name, cmd.base.language);
}
G_SyncPlayerDispAndInventory_DCNTE_6x70 as_dc_nte() const {
G_SyncPlayerDispAndInventory_DCNTE_6x70 ret;
ret.base = this->base;
ret.unknown_a5 = this->unknown_a5_nte;
ret.unknown_a6 = this->unknown_a6;
ret.telepipe = this->telepipe;
ret.unknown_a8 = this->unknown_a8;
ret.unknown_a9 = this->unknown_a9_nte_112000;
ret.area = this->area;
ret.flags2 = this->flags2;
ret.visual = this->visual;
ret.stats = this->stats;
ret.num_items = this->num_items;
ret.items = this->items;
return ret;
}
G_SyncPlayerDispAndInventory_DC112000_6x70 as_dc_112000() const {
G_SyncPlayerDispAndInventory_DC112000_6x70 ret;
ret.base = this->base;
ret.bonus_hp_from_materials = this->bonus_hp_from_materials;
ret.bonus_tp_from_materials = this->bonus_tp_from_materials;
ret.unknown_a5 = this->unknown_a5_112000;
ret.telepipe = this->telepipe;
ret.unknown_a8 = this->unknown_a8;
ret.unknown_a9 = this->unknown_a9_nte_112000;
ret.area = this->area;
ret.flags2 = this->flags2;
ret.visual = this->visual;
ret.stats = this->stats;
ret.num_items = this->num_items;
ret.items = this->items;
return ret;
}
G_SyncPlayerDispAndInventory_DC_PC_6x70 as_dc_pc() const {
G_SyncPlayerDispAndInventory_DC_PC_6x70 ret;
ret.base = this->base_v1();
ret.stats = this->stats;
ret.num_items = this->num_items;
ret.items = this->items;
return ret;
}
G_SyncPlayerDispAndInventory_GC_6x70 as_gc() const {
G_SyncPlayerDispAndInventory_GC_6x70 ret;
ret.base = this->base_v1();
ret.stats = this->stats;
ret.num_items = this->num_items;
ret.items = this->items;
ret.floor = this->floor;
return ret;
}
G_SyncPlayerDispAndInventory_XB_6x70 as_xb() const {
G_SyncPlayerDispAndInventory_XB_6x70 ret;
ret.base = this->base_v1();
ret.stats = this->stats;
ret.num_items = this->num_items;
ret.items = this->items;
ret.floor = this->floor;
ret.xb_user_id_high = this->xb_user_id >> 32;
ret.xb_user_id_low = this->xb_user_id;
ret.unknown_a16 = this->xb_unknown_a16;
return ret;
}
G_SyncPlayerDispAndInventory_BB_6x70 as_bb(uint8_t language) const {
G_SyncPlayerDispAndInventory_BB_6x70 ret;
ret.base = this->base_v1();
ret.name.encode("\tJ" + this->name, language);
ret.base.visual.name.encode(string_printf("%10" PRId32, this->guild_card_number), language);
ret.stats = this->stats;
ret.num_items = this->num_items;
ret.items = this->items;
ret.floor = this->floor;
ret.xb_user_id_high = this->xb_user_id >> 32;
ret.xb_user_id_low = this->xb_user_id;
ret.unknown_a16 = this->xb_unknown_a16;
return ret;
}
uint64_t default_xb_user_id() const {
return (0xAE00000000000000 | this->guild_card_number);
}
void clear_dc_protos_unused_item_fields() {
for (size_t z = 0; z < min<uint32_t>(this->num_items, 30); z++) {
auto& item = this->items[z];
item.unknown_a1 = 0;
item.extension_data1 = 0;
item.extension_data2 = 0;
}
}
void transcode_inventory_items(
Version from_version,
Version to_version,
shared_ptr<const ItemParameterTable> to_item_parameter_table) {
if (this->num_items > 30) {
throw runtime_error("invalid inventory item count");
}
if (from_version != to_version) {
for (size_t z = 0; z < this->num_items; z++) {
this->items[z].data.decode_for_version(from_version);
this->items[z].data.encode_for_version(to_version, to_item_parameter_table);
}
}
for (size_t z = this->num_items; z < 30; z++) {
auto& item = this->items[z];
item.present = 0;
item.unknown_a1 = 0;
item.flags = 0;
item.data.clear();
}
if (is_v1(to_version)) {
for (size_t z = 0; z < 30; z++) {
auto& item = this->items[z];
item.extension_data1 = 0x00;
item.extension_data2 = 0x00;
}
} else {
for (size_t z = 20; z < 30; z++) {
this->items[z].extension_data1 = 0x00;
}
for (size_t z = 16; z < 30; z++) {
this->items[z].extension_data2 = 0x00;
}
}
}
protected:
Parsed6x70Data(const G_SyncPlayerDispAndInventory_BaseV1& base, uint32_t guild_card_number) {
this->base = base.base;
this->bonus_hp_from_materials = base.bonus_hp_from_materials;
this->bonus_tp_from_materials = base.bonus_tp_from_materials;
this->unknown_a4_final = base.unknown_a4;
this->language = base.language;
this->player_tag = base.player_tag;
this->guild_card_number = guild_card_number; // Ignore the client's GC#
this->unknown_a6 = base.unknown_a6;
this->battle_team_number = base.battle_team_number;
this->telepipe = base.telepipe;
this->unknown_a8 = base.unknown_a8;
this->unknown_a9_final = base.unknown_a9;
this->area = base.area;
this->flags2 = base.flags2;
this->technique_levels_v1 = base.technique_levels_v1;
this->visual = base.visual;
}
G_SyncPlayerDispAndInventory_BaseV1 base_v1() const {
G_SyncPlayerDispAndInventory_BaseV1 ret;
ret.base = this->base;
ret.bonus_hp_from_materials = this->bonus_hp_from_materials;
ret.bonus_tp_from_materials = this->bonus_tp_from_materials;
ret.unknown_a4 = this->unknown_a4_final;
ret.language = this->language;
ret.player_tag = this->player_tag;
ret.guild_card_number = this->guild_card_number;
ret.unknown_a6 = this->unknown_a6;
ret.battle_team_number = this->battle_team_number;
ret.telepipe = this->telepipe;
ret.unknown_a8 = this->unknown_a8;
ret.unknown_a9 = this->unknown_a9_final;
ret.area = this->area;
ret.flags2 = this->flags2;
ret.technique_levels_v1 = this->technique_levels_v1;
ret.visual = this->visual;
return ret;
}
};
static void on_sync_joining_player_disp_and_inventory( static void on_sync_joining_player_disp_and_inventory(
shared_ptr<Client> c, uint8_t command, uint8_t flag, void* data, size_t size) { shared_ptr<Client> c, uint8_t command, uint8_t flag, void* data, size_t size) {
auto s = c->require_server_state(); auto s = c->require_server_state();
@@ -426,224 +741,80 @@ static void on_sync_joining_player_disp_and_inventory(
return; return;
} }
// Exactly one of the versioned pointers will be valid, and base will be valid unique_ptr<Parsed6x70Data> parsed;
// if and only if neither dc_nte_cmd nor dc_112000_cmd are valid.
G_SyncPlayerDispAndInventory_Base* base = nullptr;
G_SyncPlayerDispAndInventory_DCNTE_6x70* dc_nte_cmd = nullptr;
G_SyncPlayerDispAndInventory_DC112000_6x70* dc_112000_cmd = nullptr;
G_SyncPlayerDispAndInventory_DC_PC_6x70* v2_cmd = nullptr;
G_SyncPlayerDispAndInventory_GC_6x70* gc_cmd = nullptr;
G_SyncPlayerDispAndInventory_XB_6x70* xb_cmd = nullptr;
G_SyncPlayerDispAndInventory_BB_6x70* bb_cmd = nullptr;
switch (c->version()) { switch (c->version()) {
case Version::DC_NTE: case Version::DC_NTE:
dc_nte_cmd = &check_size_t<G_SyncPlayerDispAndInventory_DCNTE_6x70>(data, size); parsed = make_unique<Parsed6x70Data>(
check_size_t<G_SyncPlayerDispAndInventory_DCNTE_6x70>(data, size),
c->license->serial_number);
parsed->clear_dc_protos_unused_item_fields();
break; break;
case Version::DC_V1_11_2000_PROTOTYPE: case Version::DC_V1_11_2000_PROTOTYPE:
dc_112000_cmd = &check_size_t<G_SyncPlayerDispAndInventory_DC112000_6x70>(data, size); parsed = make_unique<Parsed6x70Data>(
check_size_t<G_SyncPlayerDispAndInventory_DC112000_6x70>(data, size),
c->license->serial_number,
c->language());
parsed->clear_dc_protos_unused_item_fields();
break; break;
case Version::DC_V1: case Version::DC_V1:
case Version::DC_V2: case Version::DC_V2:
case Version::PC_NTE: case Version::PC_NTE:
case Version::PC_V2: case Version::PC_V2:
v2_cmd = &check_size_t<G_SyncPlayerDispAndInventory_DC_PC_6x70>(data, size); parsed = make_unique<Parsed6x70Data>(
base = &v2_cmd->base; check_size_t<G_SyncPlayerDispAndInventory_DC_PC_6x70>(data, size),
c->license->serial_number);
break; break;
case Version::GC_NTE: case Version::GC_NTE:
case Version::GC_V3: case Version::GC_V3:
case Version::GC_EP3_NTE: case Version::GC_EP3_NTE:
case Version::GC_EP3: case Version::GC_EP3:
gc_cmd = &check_size_t<G_SyncPlayerDispAndInventory_GC_6x70>(data, size); parsed = make_unique<Parsed6x70Data>(
base = &gc_cmd->base; check_size_t<G_SyncPlayerDispAndInventory_GC_6x70>(data, size),
c->license->serial_number);
break; break;
case Version::XB_V3: case Version::XB_V3:
xb_cmd = &check_size_t<G_SyncPlayerDispAndInventory_XB_6x70>(data, size); parsed = make_unique<Parsed6x70Data>(
base = &xb_cmd->base; check_size_t<G_SyncPlayerDispAndInventory_XB_6x70>(data, size),
c->license->serial_number);
break; break;
case Version::BB_V4: case Version::BB_V4:
bb_cmd = &check_size_t<G_SyncPlayerDispAndInventory_BB_6x70>(data, size); parsed = make_unique<Parsed6x70Data>(
base = &bb_cmd->base; check_size_t<G_SyncPlayerDispAndInventory_BB_6x70>(data, size),
c->license->serial_number);
break; break;
default: default:
throw logic_error("6x70 command from unknown game version"); throw logic_error("6x70 command from unknown game version");
} }
auto transcode_inventory_items = [&]<typename CmdT>(CmdT* cmd) -> void { parsed->transcode_inventory_items(c->version(), target->version(), s->item_parameter_table_for_version(target->version()));
if (cmd->num_items > 30) { parsed->visual.enforce_lobby_join_limits_for_version(target->version());
throw runtime_error("invalid inventory item count");
}
if (c->version() != target->version()) {
auto item_parameter_table = s->item_parameter_table_for_version(target->version());
for (size_t z = 0; z < cmd->num_items; z++) {
cmd->items[z].data.decode_for_version(c->version());
cmd->items[z].data.encode_for_version(c->version(), item_parameter_table);
}
}
for (size_t z = cmd->num_items; z < 30; z++) {
auto& item = cmd->items[z];
item.present = 0;
item.unknown_a1 = 0;
item.flags = 0;
item.data.clear();
}
for (size_t z = 20; z < 30; z++) {
cmd->items[z].extension_data1 = 0x00;
}
for (size_t z = 16; z < 30; z++) {
cmd->items[z].extension_data2 = 0x00;
}
};
switch (target->version()) { switch (target->version()) {
case Version::DC_NTE: case Version::DC_NTE:
if (!dc_nte_cmd) { send_or_enqueue_joining_player_command(target, command, flag, parsed->as_dc_nte());
throw runtime_error("target player is not the same version as sender");
}
transcode_inventory_items(dc_nte_cmd);
send_or_enqueue_joining_player_command(target, command, flag, *dc_nte_cmd);
break; break;
case Version::DC_V1_11_2000_PROTOTYPE: case Version::DC_V1_11_2000_PROTOTYPE:
if (!dc_112000_cmd) { send_or_enqueue_joining_player_command(target, command, flag, parsed->as_dc_112000());
throw runtime_error("target player is not the same version as sender");
}
transcode_inventory_items(dc_112000_cmd);
send_or_enqueue_joining_player_command(target, command, flag, *dc_112000_cmd);
break; break;
case Version::DC_V1: case Version::DC_V1:
case Version::DC_V2: case Version::DC_V2:
case Version::PC_NTE: case Version::PC_NTE:
case Version::PC_V2: case Version::PC_V2:
if (v2_cmd) { send_or_enqueue_joining_player_command(target, command, flag, parsed->as_dc_pc());
transcode_inventory_items(v2_cmd);
send_or_enqueue_joining_player_command(target, command, flag, *v2_cmd);
} else {
G_SyncPlayerDispAndInventory_DC_PC_6x70 out_cmd;
out_cmd.base = *base;
if (gc_cmd) {
out_cmd.stats = gc_cmd->stats;
out_cmd.num_items = gc_cmd->num_items;
out_cmd.items = gc_cmd->items;
} else if (xb_cmd) {
out_cmd.stats = xb_cmd->stats;
out_cmd.num_items = xb_cmd->num_items;
out_cmd.items = xb_cmd->items;
} else if (bb_cmd) {
out_cmd.base.visual.name.encode(bb_cmd->name.decode(c->language()), target->language());
out_cmd.stats = bb_cmd->stats;
out_cmd.num_items = bb_cmd->num_items;
out_cmd.items = bb_cmd->items;
} else {
throw logic_error("no source data can be converted to the required format");
}
transcode_inventory_items(&out_cmd);
send_or_enqueue_joining_player_command(target, command, flag, out_cmd);
}
break; break;
case Version::GC_NTE: case Version::GC_NTE:
case Version::GC_V3: case Version::GC_V3:
case Version::GC_EP3_NTE: case Version::GC_EP3_NTE:
case Version::GC_EP3: case Version::GC_EP3:
if (gc_cmd) { send_or_enqueue_joining_player_command(target, command, flag, parsed->as_gc());
transcode_inventory_items(gc_cmd);
send_or_enqueue_joining_player_command(target, command, flag, *gc_cmd);
} else {
G_SyncPlayerDispAndInventory_GC_6x70 out_cmd;
out_cmd.base = *base;
if (v2_cmd) {
out_cmd.stats = v2_cmd->stats;
out_cmd.num_items = v2_cmd->num_items;
out_cmd.items = v2_cmd->items;
out_cmd.floor = c->floor;
} else if (xb_cmd) {
out_cmd.stats = xb_cmd->stats;
out_cmd.num_items = xb_cmd->num_items;
out_cmd.items = xb_cmd->items;
out_cmd.floor = xb_cmd->floor;
} else if (bb_cmd) {
out_cmd.base.visual.name.encode(bb_cmd->name.decode(c->language()), target->language());
out_cmd.stats = bb_cmd->stats;
out_cmd.num_items = bb_cmd->num_items;
out_cmd.items = bb_cmd->items;
out_cmd.floor = bb_cmd->floor;
} else {
throw logic_error("no source data can be converted to the required format");
}
transcode_inventory_items(&out_cmd);
send_or_enqueue_joining_player_command(target, command, flag, out_cmd);
}
break; break;
case Version::XB_V3: case Version::XB_V3:
if (xb_cmd) { send_or_enqueue_joining_player_command(target, command, flag, parsed->as_xb());
transcode_inventory_items(xb_cmd);
send_or_enqueue_joining_player_command(target, command, flag, *xb_cmd);
} else {
uint64_t xb_user_id = (c->license->xb_user_id)
? c->license->xb_user_id
: (0xAE00000000000000 | c->license->serial_number);
G_SyncPlayerDispAndInventory_XB_6x70 out_cmd;
out_cmd.base = *base;
out_cmd.xb_user_id_high = (xb_user_id >> 32) & 0xFFFFFFFF;
out_cmd.xb_user_id_low = xb_user_id & 0xFFFFFFFF;
if (v2_cmd) {
out_cmd.stats = v2_cmd->stats;
out_cmd.num_items = v2_cmd->num_items;
out_cmd.items = v2_cmd->items;
out_cmd.floor = c->floor;
} else if (gc_cmd) {
out_cmd.stats = gc_cmd->stats;
out_cmd.num_items = gc_cmd->num_items;
out_cmd.items = gc_cmd->items;
out_cmd.floor = gc_cmd->floor;
} else if (bb_cmd) {
out_cmd.base.visual.name.encode(bb_cmd->name.decode(c->language()), target->language());
out_cmd.stats = bb_cmd->stats;
out_cmd.num_items = bb_cmd->num_items;
out_cmd.items = bb_cmd->items;
out_cmd.floor = bb_cmd->floor;
} else {
throw logic_error("no source data can be converted to the required format");
}
transcode_inventory_items(&out_cmd);
send_or_enqueue_joining_player_command(target, command, flag, out_cmd);
}
break; break;
case Version::BB_V4: case Version::BB_V4:
if (bb_cmd) { send_or_enqueue_joining_player_command(target, command, flag, parsed->as_bb(target->language()));
transcode_inventory_items(bb_cmd);
send_or_enqueue_joining_player_command(target, command, flag, *bb_cmd);
} else {
G_SyncPlayerDispAndInventory_BB_6x70 out_cmd;
out_cmd.base = *base;
out_cmd.base.visual.name.encode(string_printf("%10" PRIu32, c->license->serial_number), target->language());
out_cmd.name.encode(base->visual.name.decode(c->language()), target->language());
if (v2_cmd) {
out_cmd.stats = v2_cmd->stats;
out_cmd.num_items = v2_cmd->num_items;
out_cmd.items = v2_cmd->items;
out_cmd.floor = c->floor;
} else if (gc_cmd) {
out_cmd.stats = gc_cmd->stats;
out_cmd.num_items = gc_cmd->num_items;
out_cmd.items = gc_cmd->items;
out_cmd.floor = gc_cmd->floor;
} else if (xb_cmd) {
out_cmd.stats = xb_cmd->stats;
out_cmd.num_items = xb_cmd->num_items;
out_cmd.items = xb_cmd->items;
out_cmd.floor = xb_cmd->floor;
} else {
throw logic_error("no source data can be converted to the required format");
}
transcode_inventory_items(&out_cmd);
send_or_enqueue_joining_player_command(target, command, flag, out_cmd);
}
break; break;
default: default:
throw logic_error("6x70 command from unknown game version"); throw logic_error("6x70 command from unknown game version");
} }
@@ -919,6 +1090,7 @@ static void on_change_floor_6x1F(shared_ptr<Client> c, uint8_t command, uint8_t
// the loading flag here instead. // the loading flag here instead.
if (c->config.check_flag(Client::Flag::LOADING)) { if (c->config.check_flag(Client::Flag::LOADING)) {
c->config.clear_flag(Client::Flag::LOADING); c->config.clear_flag(Client::Flag::LOADING);
send_resume_game(c->require_lobby(), c);
} }
} else { } else {
src/SendCommands.cc
+13 -9
View File
@@ -1701,7 +1701,7 @@ static void send_join_spectator_team(shared_ptr<Client> c, shared_ptr<Lobby> l)
p.inventory = wc_p->inventory; p.inventory = wc_p->inventory;
p.inventory.encode_for_client(c); p.inventory.encode_for_client(c);
p.disp = wc_p->disp.to_dcpcv3(c->language(), p.inventory.language); p.disp = wc_p->disp.to_dcpcv3(c->language(), p.inventory.language);
p.disp.enforce_lobby_join_limits_for_client(c); p.disp.enforce_lobby_join_limits_for_version(c->version());
auto& e = cmd.entries[z]; auto& e = cmd.entries[z];
e.player_tag = 0x00010000; e.player_tag = 0x00010000;
@@ -1739,7 +1739,7 @@ static void send_join_spectator_team(shared_ptr<Client> c, shared_ptr<Lobby> l)
p.inventory = entry.inventory; p.inventory = entry.inventory;
p.inventory.encode_for_client(c); p.inventory.encode_for_client(c);
p.disp = entry.disp; p.disp = entry.disp;
p.disp.enforce_lobby_join_limits_for_client(c); p.disp.enforce_lobby_join_limits_for_version(c->version());
auto& e = cmd.entries[client_id]; auto& e = cmd.entries[client_id];
e.player_tag = 0x00010000; e.player_tag = 0x00010000;
@@ -1765,7 +1765,7 @@ static void send_join_spectator_team(shared_ptr<Client> c, shared_ptr<Lobby> l)
populate_lobby_data_for_client(cmd_p.lobby_data, other_c, c); populate_lobby_data_for_client(cmd_p.lobby_data, other_c, c);
cmd_p.inventory = other_p->inventory; cmd_p.inventory = other_p->inventory;
cmd_p.disp = other_p->disp.to_dcpcv3(c->language(), cmd_p.inventory.language); cmd_p.disp = other_p->disp.to_dcpcv3(c->language(), cmd_p.inventory.language);
cmd_p.disp.enforce_lobby_join_limits_for_client(c); cmd_p.disp.enforce_lobby_join_limits_for_version(c->version());
cmd_e.player_tag = 0x00010000; cmd_e.player_tag = 0x00010000;
cmd_e.guild_card_number = other_c->license->serial_number; cmd_e.guild_card_number = other_c->license->serial_number;
@@ -1880,7 +1880,7 @@ void send_join_game(shared_ptr<Client> c, shared_ptr<Lobby> l) {
cmd.players_ep3[x].inventory = other_p->inventory; cmd.players_ep3[x].inventory = other_p->inventory;
cmd.players_ep3[x].inventory.encode_for_client(c); cmd.players_ep3[x].inventory.encode_for_client(c);
cmd.players_ep3[x].disp = convert_player_disp_data<PlayerDispDataDCPCV3>(other_p->disp, c->language(), other_p->inventory.language); cmd.players_ep3[x].disp = convert_player_disp_data<PlayerDispDataDCPCV3>(other_p->disp, c->language(), other_p->inventory.language);
cmd.players_ep3[x].disp.enforce_lobby_join_limits_for_client(c); cmd.players_ep3[x].disp.enforce_lobby_join_limits_for_version(c->version());
} }
} }
send_command_t(c, 0x64, player_count, cmd); send_command_t(c, 0x64, player_count, cmd);
@@ -1991,7 +1991,7 @@ void send_join_lobby_t(shared_ptr<Client> c, shared_ptr<Lobby> l, shared_ptr<Cli
e.disp = convert_player_disp_data<DispDataT>(*lc->v1_v2_last_reported_disp, c->language(), lp->inventory.language); e.disp = convert_player_disp_data<DispDataT>(*lc->v1_v2_last_reported_disp, c->language(), lp->inventory.language);
} else { } else {
e.disp = convert_player_disp_data<DispDataT>(lp->disp, c->language(), lp->inventory.language); e.disp = convert_player_disp_data<DispDataT>(lp->disp, c->language(), lp->inventory.language);
e.disp.enforce_lobby_join_limits_for_client(c); e.disp.enforce_lobby_join_limits_for_version(c->version());
} }
} }
@@ -2057,7 +2057,7 @@ void send_join_lobby_xb(shared_ptr<Client> c, shared_ptr<Lobby> l, shared_ptr<Cl
e.inventory = lp->inventory; e.inventory = lp->inventory;
e.inventory.encode_for_client(c); e.inventory.encode_for_client(c);
e.disp = convert_player_disp_data<PlayerDispDataDCPCV3>(lp->disp, c->language(), lp->inventory.language); e.disp = convert_player_disp_data<PlayerDispDataDCPCV3>(lp->disp, c->language(), lp->inventory.language);
e.disp.enforce_lobby_join_limits_for_client(c); e.disp.enforce_lobby_join_limits_for_version(c->version());
} }
send_command(c, command, used_entries, &cmd, cmd.size(used_entries)); send_command(c, command, used_entries, &cmd, cmd.size(used_entries));
@@ -2102,7 +2102,7 @@ void send_join_lobby_dc_nte(shared_ptr<Client> c, shared_ptr<Lobby> l,
e.inventory = lp->inventory; e.inventory = lp->inventory;
e.inventory.encode_for_client(c); e.inventory.encode_for_client(c);
e.disp = convert_player_disp_data<PlayerDispDataDCPCV3>(lp->disp, c->language(), lp->inventory.language); e.disp = convert_player_disp_data<PlayerDispDataDCPCV3>(lp->disp, c->language(), lp->inventory.language);
e.disp.enforce_lobby_join_limits_for_client(c); e.disp.enforce_lobby_join_limits_for_version(c->version());
} }
send_command(c, command, used_entries, &cmd, cmd.size(used_entries)); send_command(c, command, used_entries, &cmd, cmd.size(used_entries));
@@ -2288,8 +2288,12 @@ void send_arrow_update(shared_ptr<Lobby> l) {
// tells the player that the joining player is done joining, and the game can resume // tells the player that the joining player is done joining, and the game can resume
void send_resume_game(shared_ptr<Lobby> l, shared_ptr<Client> ready_client) { void send_resume_game(shared_ptr<Lobby> l, shared_ptr<Client> ready_client) {
static const be_uint32_t data = 0x72010000; for (auto lc : l->clients) {
send_command_excluding_client(l, ready_client, 0x60, 0x00, &data, sizeof(be_uint32_t)); if (lc && (lc != ready_client) && !is_pre_v1(lc->version())) {
static const be_uint32_t data = 0x72010000;
send_command(lc, 0x60, 0x00, &data, sizeof(be_uint32_t));
}
}
} }
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////