default-clear all converted_endian parrays to zero

2023-09-21 17:07:58 -07:00
parent 931258e8ac
commit 93906f8ff3
4 changed files with 32 additions and 105 deletions
@@ -17,32 +17,6 @@

 FileContentsCache player_files_cache(300 * 1000 * 1000);

-PlayerStats::PlayerStats() noexcept
-    : level(0),
-      experience(0),
-      meseta(0) {}
-
-PlayerVisualConfig::PlayerVisualConfig() noexcept
-    : unknown_a2(0),
-      name_color(0),
-      extra_model(0),
-      unknown_a3(0),
-      section_id(0),
-      char_class(0),
-      v2_flags(0),
-      version(0),
-      v1_flags(0),
-      costume(0),
-      skin(0),
-      face(0),
-      head(0),
-      hair(0),
-      hair_r(0),
-      hair_g(0),
-      hair_b(0),
-      proportion_x(0),
-      proportion_y(0) {}
-
 void PlayerDispDataDCPCV3::enforce_v2_limits() {
  // V1/V2 have fewer classes, so we'll substitute some here
  if (this->visual.char_class == 11) {
@@ -73,10 +47,6 @@ PlayerDispDataBB PlayerDispDataDCPCV3::to_bb() const {
  return bb;
 }

-PlayerDispDataBB::PlayerDispDataBB() noexcept
-    : play_time(0),
-      unknown_a3(0) {}
-
 PlayerDispDataDCPCV3 PlayerDispDataBB::to_dcpcv3() const {
  PlayerDispDataDCPCV3 ret;
  ret.stats = this->stats;
@@ -127,26 +97,6 @@ void PlayerDispDataBB::apply_dressing_room(const PlayerDispDataBBPreview& pre) {
  this->name = pre.name;
 }

-PlayerDispDataBBPreview::PlayerDispDataBBPreview() noexcept
-    : experience(0),
-      level(0),
-      play_time(0) {}
-
-GuildCardV3::GuildCardV3() noexcept
-    : player_tag(0),
-      guild_card_number(0),
-      present(0),
-      language(0),
-      section_id(0),
-      char_class(0) {}
-
-GuildCardBB::GuildCardBB() noexcept
-    : guild_card_number(0),
-      present(0),
-      language(0),
-      section_id(0),
-      char_class(0) {}
-
 void GuildCardBB::clear() {
  this->guild_card_number = 0;
  this->name.clear(0);
@@ -108,14 +108,12 @@ struct PlayerStats {
  /* 1C */ le_uint32_t experience = 0;
  /* 20 */ le_uint32_t meseta = 0;
  /* 24 */
-
-  PlayerStats() noexcept;
 } __attribute__((packed));

 struct PlayerVisualConfig {
  /* 00 */ ptext<char, 0x10> name;
  /* 10 */ le_uint64_t unknown_a2 = 0; // Note: This is probably not actually a 64-bit int.
-  /* 18 */ le_uint32_t name_color = 0xFFFFFFFF; // RGBA
+  /* 18 */ le_uint32_t name_color = 0x00000000; // RGBA
  /* 1C */ uint8_t extra_model = 0;
  /* 1D */ parray<uint8_t, 0x0F> unused;
  /* 2C */ le_uint32_t unknown_a3 = 0;
@@ -135,8 +133,6 @@ struct PlayerVisualConfig {
  /* 48 */ le_float proportion_x = 0.0;
  /* 4C */ le_float proportion_y = 0.0;
  /* 50 */
-
-  PlayerVisualConfig() noexcept;
 } __attribute__((packed));

 struct PlayerDispDataDCPCV3 {
@@ -145,28 +141,19 @@ struct PlayerDispDataDCPCV3 {
  /* 74 */ parray<uint8_t, 0x48> config;
  /* BC */ parray<uint8_t, 0x14> v1_technique_levels;
  /* D0 */
-
-  // Note: This struct has a default constructor because it's used in a command
-  // that has a fixed-size array. If we didn't define this constructor, the
-  // trivial fields in that array's members would be uninitialized, and we could
-  // send uninitialized memory to the client.
-  PlayerDispDataDCPCV3() noexcept = default;
-
  void enforce_v2_limits();
  PlayerDispDataBB to_bb() const;
 } __attribute__((packed));

 struct PlayerDispDataBBPreview {
-  /* 00 */ le_uint32_t experience;
-  /* 04 */ le_uint32_t level;
+  /* 00 */ le_uint32_t experience = 0;
+  /* 04 */ le_uint32_t level = 0;
  // The name field in this structure is used for the player's Guild Card
  // number, apparently (possibly because it's a char array and this is BB)
  /* 08 */ PlayerVisualConfig visual;
  /* 58 */ ptext<char16_t, 0x10> name;
-  /* 78 */ uint32_t play_time;
+  /* 78 */ uint32_t play_time = 0;
  /* 7C */
-
-  PlayerDispDataBBPreview() noexcept;
 } __attribute__((packed));

 // BB player appearance and stats data
@@ -174,14 +161,12 @@ struct PlayerDispDataBB {
  /* 0000 */ PlayerStats stats;
  /* 0024 */ PlayerVisualConfig visual;
  /* 0074 */ ptext<char16_t, 0x0C> name;
-  /* 008C */ le_uint32_t play_time;
-  /* 0090 */ uint32_t unknown_a3;
+  /* 008C */ le_uint32_t play_time = 0;
+  /* 0090 */ uint32_t unknown_a3 = 0;
  /* 0094 */ parray<uint8_t, 0xE8> config;
  /* 017C */ parray<uint8_t, 0x14> technique_levels;
  /* 0190 */

-  PlayerDispDataBB() noexcept;
-
  inline void enforce_v2_limits() {}
  PlayerDispDataDCPCV3 to_dcpcv3() const;
  PlayerDispDataBBPreview to_preview() const;
@@ -192,32 +177,29 @@ struct PlayerDispDataBB {
 // TODO: Is this the same for XB as it is for GC? (This struct is based on the
 // GC format)
 struct GuildCardV3 {
-  /* 00 */ le_uint32_t player_tag;
-  /* 04 */ le_uint32_t guild_card_number;
+  /* 00 */ le_uint32_t player_tag = 0;
+  /* 04 */ le_uint32_t guild_card_number = 0;
  /* 08 */ ptext<char, 0x18> name;
  /* 20 */ ptext<char, 0x6C> description;
-  /* 8C */ uint8_t present; // should be 1
-  /* 8D */ uint8_t language;
-  /* 8E */ uint8_t section_id;
-  /* 8F */ uint8_t char_class;
+  /* 8C */ uint8_t present = 0;
+  /* 8D */ uint8_t language = 0;
+  /* 8E */ uint8_t section_id = 0;
+  /* 8F */ uint8_t char_class = 0;
  /* 90 */
-
-  GuildCardV3() noexcept;
 } __attribute__((packed));

 // BB guild card format
 struct GuildCardBB {
-  /* 0000 */ le_uint32_t guild_card_number;
+  /* 0000 */ le_uint32_t guild_card_number = 0;
  /* 0004 */ ptext<char16_t, 0x18> name;
  /* 0034 */ ptext<char16_t, 0x10> team_name;
  /* 0054 */ ptext<char16_t, 0x58> description;
-  /* 0104 */ uint8_t present; // should be 1 if guild card entry exists
-  /* 0105 */ uint8_t language;
-  /* 0106 */ uint8_t section_id;
-  /* 0107 */ uint8_t char_class;
+  /* 0104 */ uint8_t present = 0;
+  /* 0105 */ uint8_t language = 0;
+  /* 0106 */ uint8_t section_id = 0;
+  /* 0107 */ uint8_t char_class = 0;
  /* 0108 */

-  GuildCardBB() noexcept;
  void clear();
 } __attribute__((packed));

@@ -244,14 +226,14 @@ struct KeyAndTeamConfigBB {
  parray<uint8_t, 0x0114> unknown_a1; // 0000
  parray<uint8_t, 0x016C> key_config; // 0114
  parray<uint8_t, 0x0038> joystick_config; // 0280
-  le_uint32_t guild_card_number; // 02B8
-  le_uint32_t team_id; // 02BC
-  le_uint64_t team_info; // 02C0
-  le_uint16_t team_privilege_level; // 02C8
-  le_uint16_t reserved; // 02CA
+  le_uint32_t guild_card_number = 0; // 02B8
+  le_uint32_t team_id = 0; // 02BC
+  le_uint64_t team_info = 0; // 02C0
+  le_uint16_t team_privilege_level = 0; // 02C8
+  le_uint16_t reserved = 0; // 02CA
  ptext<char16_t, 0x0010> team_name; // 02CC
  parray<uint8_t, 0x0800> team_flag; // 02EC
-  le_uint32_t team_rewards; // 0AEC
+  le_uint32_t team_rewards = 0; // 0AEC
 } __attribute__((packed));

 struct PlayerLobbyDataPC {
@@ -412,7 +394,7 @@ struct PlayerRecords_Battle {
  using U16T = typename std::conditional<IsBigEndian, be_uint16_t, le_uint16_t>::type;
  // On Episode 3, place_counts[0] is win count and [1] is loss count
  /* 00 */ parray<U16T, 4> place_counts;
-  /* 08 */ U16T disconnect_count;
+  /* 08 */ U16T disconnect_count = 0;
  /* 0A */ parray<uint16_t, 3> unknown_a1;
  /* 10 */ parray<uint32_t, 2> unknown_a2;
  /* 18 */
@@ -429,8 +411,6 @@ struct ChoiceSearchConfig {
  parray<Entry, 5> entries;
 } __attribute__((packed));

-uint32_t compute_guild_card_checksum(const void* data, size_t size);
-
 template <typename DestT, typename SrcT = DestT>
 DestT convert_player_disp_data(const SrcT&) {
  static_assert(always_false<DestT, SrcT>::v,
@@ -1457,8 +1457,6 @@ static void send_join_spectator_team(shared_ptr<Client> c, shared_ptr<Lobby> l)
      e.level = wc->game_data.ep3_config
          ? (wc->game_data.ep3_config->online_clv_exp / 100)
          : wc->game_data.player()->disp.stats.level.load();
-      e.unknown_a5.clear(0);
-      e.unknown_a6.clear(0);

      player_count++;
    }
@@ -1497,8 +1495,6 @@ static void send_join_spectator_team(shared_ptr<Client> c, shared_ptr<Lobby> l)
      remove_language_marker_inplace(e.name);
      e.present = 1;
      e.level = entry.disp.stats.level.load();
-      e.unknown_a5.clear(0);
-      e.unknown_a6.clear(0);
      player_count++;
    }

@@ -1507,11 +1503,9 @@ static void send_join_spectator_team(shared_ptr<Client> c, shared_ptr<Lobby> l)
  }

  for (size_t z = 4; z < 12; z++) {
-    auto& p = cmd.spectator_players[z - 4];
-    auto& e = cmd.entries[z];
-    e.unknown_a5.clear(0);
-    e.unknown_a6.clear(0);
    if (l->clients[z]) {
+      auto& p = cmd.spectator_players[z - 4];
+      auto& e = cmd.entries[z];
      p.lobby_data.player_tag = 0x00010000;
      p.lobby_data.guild_card = l->clients[z]->license->serial_number;
      p.lobby_data.client_id = l->clients[z]->lobby_client_id;
@@ -190,15 +190,18 @@ struct parray {
  parray(ItemT v) {
    this->clear(v);
  }
-  template <typename ArgT = ItemT, std::enable_if_t<std::is_arithmetic<ArgT>::value, bool> = true>
+  template <typename ArgT = ItemT>
+    requires(std::is_arithmetic_v<ArgT> || is_converted_endian_sc_v<ArgT>)
  parray() {
    this->clear(0);
  }
-  template <typename ArgT = ItemT, std::enable_if_t<std::is_pointer<ArgT>::value, bool> = true>
+  template <typename ArgT = ItemT>
+    requires std::is_pointer_v<ArgT>
  parray() {
    this->clear(nullptr);
  }
-  template <typename ArgT = ItemT, std::enable_if_t<!std::is_arithmetic<ArgT>::value && !std::is_pointer<ArgT>::value, bool> = true>
+  template <typename ArgT = ItemT>
+    requires(!std::is_arithmetic_v<ArgT> && !std::is_pointer_v<ArgT> && !is_converted_endian_sc_v<ArgT>)
  parray() {}

  parray(const parray& other) {