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

fix xbox 64 command on schtserv

Browse Source
This commit is contained in:
Martin Michelsen
2023-11-21 18:33:44 -08:00
parent 3712574784
commit b0c481ed62
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ProxyCommands.cc
+5 -2
View File
@@ -1415,6 +1415,10 @@ static HandlerResult S_64(shared_ptr<ProxyServer::LinkedSession> ses, uint16_t,
if (ses->sub_version >= 0x40) { if (ses->sub_version >= 0x40) {
cmd = &check_size_t<CmdT>(data, sizeof(S_JoinGame_GC_Ep3_64)); cmd = &check_size_t<CmdT>(data, sizeof(S_JoinGame_GC_Ep3_64));
cmd_ep3 = &check_size_t<S_JoinGame_GC_Ep3_64>(data); cmd_ep3 = &check_size_t<S_JoinGame_GC_Ep3_64>(data);
} else if (ses->version() == GameVersion::XB) {
// Schtserv doesn't send the unknown_a1 field in this command, and we don't
// use it here, so we allow it to be omitted.
cmd = &check_size_t<CmdT>(data.data(), data.size(), sizeof(CmdT) - 0x18, sizeof(CmdT));
} else { } else {
cmd = &check_size_t<CmdT>(data); cmd = &check_size_t<CmdT>(data);
} }
@@ -1444,8 +1448,7 @@ static HandlerResult S_64(shared_ptr<ProxyServer::LinkedSession> ses, uint16_t,
} else { } else {
p.name.clear(); p.name.clear();
} }
ses->log.info("Added lobby player: (%zu) %" PRIu32 " %s", ses->log.info("Added lobby player: (%zu) %" PRIu32 " %s", x, p.guild_card_number, p.name.c_str());
x, p.guild_card_number, p.name.c_str());
} }
if (ses->config.override_section_id != 0xFF) { if (ses->config.override_section_id != 0xFF) {