Merge upstream changes from 2026-05-31

src/Client.hh

@@ -10,7 +10,6 @@
 #include "CommandFormats.hh"
 #include "Episode3/BattleRecord.hh"
 #include "Episode3/Tournament.hh"
-#include "FileContentsCache.hh"
 #include "PSOEncryption.hh"
 #include "PSOProtocol.hh"
 #include "PatchFileIndex.hh"
@@ -28,7 +27,7 @@ struct Lobby;
 class Parsed6x70Data;
 
 struct GetPlayerInfoResult {
-  // Exactly one of the following two shared_ptrs is not null
+  // Exactly one of the following two std::shared_ptrs is not null
   std::shared_ptr<PSOBBCharacterFile> character;
   std::shared_ptr<PSOGCEp3CharacterFile::Character> ep3_character;
   bool is_full_info; // True if the client sent 30; false if it was 61 or 98
@@ -192,8 +191,9 @@ public:
   };
   bool should_update_play_time;
   std::unordered_set<uint32_t> blocked_senders;
-  std::unique_ptr<PlayerDispDataDCPCV3> v1_v2_last_reported_disp;
+  std::unique_ptr<PlayerDispDataV123> v1_v2_last_reported_disp;
   std::shared_ptr<Parsed6x70Data> last_reported_6x70;
+  std::unordered_set<uint16_t> expected_game_state_sync_commands; // (command_num << 8) | target_client_id
   // These are null unless the client is within the trade sequence (D0-D4 or EE commands)
   std::unique_ptr<PendingItemTrade> pending_item_trade;
   std::unique_ptr<PendingCardTrade> pending_card_trade;
@@ -316,7 +316,7 @@ public:
   void create_character_file(
       uint32_t guild_card_number,
       Language language,
-      const PlayerDispDataBBPreview& preview,
+      const PlayerVisualConfigV4& visual,
       std::shared_ptr<const LevelTable> level_table);
   void create_battle_overlay(std::shared_ptr<const BattleRules> rules, std::shared_ptr<const LevelTable> level_table);
   void create_challenge_overlay(Version version, size_t template_index, std::shared_ptr<const LevelTable> level_table);