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

fix PlayerBB struct length

Browse Source
This commit is contained in:
Martin Michelsen
2022-05-12 10:45:44 -07:00
parent ba03d70a2e
commit 71d78839a4
3 changed files with 27 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Player.cc
-1
View File
@@ -489,7 +489,6 @@ PlayerBB ClientGameData::export_player_bb() {
ret.unknown6.clear(); ret.unknown6.clear();
ret.quest_data2 = player->quest_data2; ret.quest_data2 = player->quest_data2;
ret.key_config = account->key_config; ret.key_config = account->key_config;
ret.unused = 0;
return ret; return ret;
} }
src/Player.hh
+26 -27
View File
@@ -314,33 +314,32 @@ struct PSOPlayerDataBB { // For command 61
} __attribute__((packed)); } __attribute__((packed));
struct PlayerBB { // Used in 00E7 command struct PlayerBB { // Used in 00E7 command
PlayerInventory inventory; // 0000 // player PlayerInventory inventory; // player
PlayerDispDataBB disp; // 034C // player PlayerDispDataBB disp; // player
parray<uint8_t, 0x0010> unknown; // 04DC // parray<uint8_t, 0x0010> unknown; // not saved
le_uint32_t option_flags; // 04EC // account le_uint32_t option_flags; // account
parray<uint8_t, 0x0208> quest_data1; // 04F0 // player parray<uint8_t, 0x0208> quest_data1; // player
PlayerBank bank; // 06F8 // player PlayerBank bank; // player
le_uint32_t serial_number; // 19C0 // player le_uint32_t serial_number; // player
ptext<char16_t, 0x18> name; // 19C4 // player ptext<char16_t, 0x18> name; // player
ptext<char16_t, 0x10> team_name; // 19C4 // player ptext<char16_t, 0x10> team_name; // player
ptext<char16_t, 0x58> guild_card_desc; // 1A14 // player ptext<char16_t, 0x58> guild_card_desc; // player
uint8_t reserved1; // 1AC4 // player uint8_t reserved1; // player
uint8_t reserved2; // 1AC5 // player uint8_t reserved2; // player
uint8_t section_id; // 1AC6 // player uint8_t section_id; // player
uint8_t char_class; // 1AC7 // player uint8_t char_class; // player
le_uint32_t unknown3; // 1AC8 // le_uint32_t unknown3; // not saved
parray<uint8_t, 0x04E0> symbol_chats; // 1ACC // account parray<uint8_t, 0x04E0> symbol_chats; // account
parray<uint8_t, 0x0A40> shortcuts; // 1FAC // account parray<uint8_t, 0x0A40> shortcuts; // account
ptext<char16_t, 0x00AC> auto_reply; // 29EC // player ptext<char16_t, 0x00AC> auto_reply; // player
ptext<char16_t, 0x00AC> info_board; // 2B44 // player ptext<char16_t, 0x00AC> info_board; // player
parray<uint8_t, 0x001C> unknown5; // 2C9C // parray<uint8_t, 0x001C> unknown5; // not saved
parray<uint8_t, 0x0140> challenge_data; // 2CB8 // player parray<uint8_t, 0x0140> challenge_data; // player
parray<uint8_t, 0x0028> tech_menu_config; // 2DF8 // player parray<uint8_t, 0x0028> tech_menu_config; // player
parray<uint8_t, 0x002C> unknown6; // 2E20 // parray<uint8_t, 0x002C> unknown6; // not saved
parray<uint8_t, 0x0058> quest_data2; // 2E4C // player parray<uint8_t, 0x0058> quest_data2; // player
KeyAndTeamConfigBB key_config; // 2EA4 // account KeyAndTeamConfigBB key_config; // account
le_uint32_t unused; } __attribute__((packed));
} __attribute__((packed)); // total size: 39A0
src/ReceiveCommands.cc
+1 -1
View File
@@ -1362,7 +1362,7 @@ void process_change_account_data_bb(shared_ptr<ServerState>, shared_ptr<Client>
} }
void process_return_player_data_bb(shared_ptr<ServerState>, shared_ptr<Client> c, void process_return_player_data_bb(shared_ptr<ServerState>, shared_ptr<Client> c,
uint16_t, uint32_t, const string& data) { uint16_t, uint32_t, const string& data) { // 00E7
const auto& cmd = check_size_t<PlayerBB>(data); const auto& cmd = check_size_t<PlayerBB>(data);
// We only trust the player's quest data and challenge data. // We only trust the player's quest data and challenge data.