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

don't encode/decode inventories in GC extended player data

Browse Source
This commit is contained in:
Martin Michelsen
2024-05-13 20:47:15 -07:00
parent df2b64a601
commit fc5788364b
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/SaveFileFormats.cc
+8 -2
View File
@@ -519,7 +519,10 @@ shared_ptr<PSOBBCharacterFile> PSOBBCharacterFile::create_from_dc_v2(const PSODC
shared_ptr<PSOBBCharacterFile> PSOBBCharacterFile::create_from_gc(const PSOGCCharacterFile::Character& gc) { shared_ptr<PSOBBCharacterFile> PSOBBCharacterFile::create_from_gc(const PSOGCCharacterFile::Character& gc) {
auto ret = make_shared<PSOBBCharacterFile>(); auto ret = make_shared<PSOBBCharacterFile>();
ret->inventory = gc.inventory; ret->inventory = gc.inventory;
ret->inventory.decode_from_client(Version::GC_V3); // Note: We intentionally do not call ret->inventory.decode_from_client here.
// This is because the GC client byteswaps data2 in each item before sending
// it to the server in the 61 and 98 commands, but GetExtendedPlayerInfo does
// not do this, so the data2 fields are already in the correct order here.
uint8_t language = ret->inventory.language; uint8_t language = ret->inventory.language;
ret->disp = gc.disp.to_bb(language, language); ret->disp = gc.disp.to_bb(language, language);
ret->creation_timestamp = gc.creation_timestamp.load(); ret->creation_timestamp = gc.creation_timestamp.load();
@@ -642,7 +645,10 @@ PSOGCCharacterFile::Character PSOBBCharacterFile::to_gc() const {
PSOGCCharacterFile::Character ret; PSOGCCharacterFile::Character ret;
ret.inventory = this->inventory; ret.inventory = this->inventory;
ret.inventory.encode_for_client(Version::GC_V3, nullptr); // Note: We intentionally do not call ret.inventory.encode_for_client here.
// This is because the GC client byteswaps data2 in each item before sending
// it to the server in the 61 and 98 commands, but GetExtendedPlayerInfo does
// not do this, so the data2 fields are already in the correct order here.
ret.disp = this->disp.to_dcpcv3<true>(language, language); ret.disp = this->disp.to_dcpcv3<true>(language, language);
ret.disp.visual.enforce_lobby_join_limits_for_version(Version::GC_V3); ret.disp.visual.enforce_lobby_join_limits_for_version(Version::GC_V3);
ret.creation_timestamp = this->creation_timestamp.load(); ret.creation_timestamp = this->creation_timestamp.load();