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

fix PCv2 6x7C command

Browse Source
This commit is contained in:
Martin Michelsen
2024-03-08 13:42:54 -08:00
parent b491a57f57
commit 287296cf48
2 changed files with 21 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/PlayerSubordinates.hh
+20 -19
View File
@@ -348,13 +348,14 @@ struct ChallengeAwardState {
template <TextEncoding UnencryptedEncoding, TextEncoding EncryptedEncoding> template <TextEncoding UnencryptedEncoding, TextEncoding EncryptedEncoding>
struct PlayerRecordsDCPC_Challenge { struct PlayerRecordsDCPC_Challenge {
/* 00 */ le_uint16_t title_color = 0x7FFF; /* DC:PC */
/* 02 */ parray<uint8_t, 2> unknown_u0; /* 00:00 */ le_uint16_t title_color = 0x7FFF;
/* 04 */ pstring<EncryptedEncoding, 0x0C> rank_title; /* 02:02 */ parray<uint8_t, 2> unknown_u0;
/* 10 */ parray<ChallengeTime<false>, 9> times_ep1_online; // TODO: This might be offline times /* 04:04 */ pstring<EncryptedEncoding, 0x0C> rank_title;
/* 34 */ uint8_t grave_stage_num = 0; /* 10:1C */ parray<ChallengeTime<false>, 9> times_ep1_online; // TODO: This might be offline times
/* 35 */ uint8_t grave_floor = 0; /* 34:40 */ uint8_t grave_stage_num = 0;
/* 36 */ le_uint16_t grave_deaths = 0; /* 35:41 */ uint8_t grave_floor = 0;
/* 36:42 */ le_uint16_t grave_deaths = 0;
// grave_time is encoded with the following bit fields: // grave_time is encoded with the following bit fields:
// YYYYMMMM DDDDDDDD HHHHHHHH mmmmmmmm // YYYYMMMM DDDDDDDD HHHHHHHH mmmmmmmm
// Y = year after 2000 (clamped to [0, 15]) // Y = year after 2000 (clamped to [0, 15])
@@ -362,22 +363,22 @@ struct PlayerRecordsDCPC_Challenge {
// D = day // D = day
// H = hour // H = hour
// m = minute // m = minute
/* 38 */ le_uint32_t grave_time = 0; /* 38:44 */ le_uint32_t grave_time = 0;
/* 3C */ le_uint32_t grave_defeated_by_enemy_rt_index = 0; /* 3C:48 */ le_uint32_t grave_defeated_by_enemy_rt_index = 0;
/* 40 */ le_float grave_x = 0.0f; /* 40:4C */ le_float grave_x = 0.0f;
/* 44 */ le_float grave_y = 0.0f; /* 44:50 */ le_float grave_y = 0.0f;
/* 48 */ le_float grave_z = 0.0f; /* 48:54 */ le_float grave_z = 0.0f;
/* 4C */ pstring<UnencryptedEncoding, 0x14> grave_team; /* 4C:58 */ pstring<UnencryptedEncoding, 0x14> grave_team;
/* 60 */ pstring<UnencryptedEncoding, 0x18> grave_message; /* 60:80 */ pstring<UnencryptedEncoding, 0x18> grave_message;
/* 78 */ parray<ChallengeTime<false>, 9> times_ep1_offline; // TODO: This might be online times /* 78:B0 */ parray<ChallengeTime<false>, 9> times_ep1_offline; // TODO: This might be online times
/* 9C */ parray<uint8_t, 4> unknown_l4; /* 9C:D4 */ parray<uint8_t, 4> unknown_l4;
/* A0 */ /* A0:D8 */
} __attribute__((packed)); } __attribute__((packed));
struct PlayerRecordsDC_Challenge : PlayerRecordsDCPC_Challenge<TextEncoding::CHALLENGE8, TextEncoding::ASCII> { struct PlayerRecordsDC_Challenge : PlayerRecordsDCPC_Challenge<TextEncoding::ASCII, TextEncoding::CHALLENGE8> {
} __attribute__((packed)); } __attribute__((packed));
struct PlayerRecordsPC_Challenge : PlayerRecordsDCPC_Challenge<TextEncoding::CHALLENGE16, TextEncoding::UTF16> { struct PlayerRecordsPC_Challenge : PlayerRecordsDCPC_Challenge<TextEncoding::UTF16, TextEncoding::CHALLENGE16> {
} __attribute__((packed)); } __attribute__((packed));
template <bool IsBigEndian> template <bool IsBigEndian>
src/ReceiveSubcommands.cc
+1 -1
View File
@@ -3309,7 +3309,7 @@ static void on_challenge_update_records(shared_ptr<Client> c, uint8_t command, u
break; break;
} }
case Version::PC_V2: { case Version::PC_V2: {
const auto& cmd = check_size_t<G_SetChallengeRecords_DC_6x7C>(data, size); const auto& cmd = check_size_t<G_SetChallengeRecords_PC_6x7C>(data, size);
p->challenge_records = cmd.records; p->challenge_records = cmd.records;
break; break;
} }