don't use member initialization
This commit is contained in:
+25
-25
@@ -1187,31 +1187,31 @@ PlayerConfigNTE::PlayerConfigNTE(const PlayerConfig& config)
|
||||
}
|
||||
|
||||
PlayerConfigNTE::operator PlayerConfig() const {
|
||||
return {
|
||||
.rank_text = this->rank_text,
|
||||
.unknown_a1 = this->unknown_a1,
|
||||
.tech_menu_shortcut_entries = this->tech_menu_shortcut_entries,
|
||||
.choice_search_config = this->choice_search_config,
|
||||
.scenario_progress = this->scenario_progress,
|
||||
.unused_offline_records = this->unused_offline_records,
|
||||
.unknown_a4 = this->unknown_a4,
|
||||
.is_encrypted = this->is_encrypted,
|
||||
.basis = this->basis,
|
||||
.unused = this->unused,
|
||||
.card_counts = this->card_counts,
|
||||
.card_count_checksums = this->card_count_checksums,
|
||||
.rare_tokens = this->rare_tokens,
|
||||
.decks = this->decks,
|
||||
.unknown_a8 = this->unknown_a8,
|
||||
.offline_clv_exp = this->offline_clv_exp,
|
||||
.online_clv_exp = this->online_clv_exp,
|
||||
.recent_human_opponents = this->recent_human_opponents,
|
||||
.unknown_a10 = this->unknown_a10,
|
||||
.init_timestamp = this->init_timestamp,
|
||||
.last_online_battle_start_timestamp = this->last_online_battle_start_timestamp,
|
||||
.unknown_t3 = this->unknown_t3,
|
||||
.unknown_a14 = this->unknown_a14,
|
||||
};
|
||||
PlayerConfig ret;
|
||||
ret.rank_text = this->rank_text;
|
||||
ret.unknown_a1 = this->unknown_a1;
|
||||
ret.tech_menu_shortcut_entries = this->tech_menu_shortcut_entries;
|
||||
ret.choice_search_config = this->choice_search_config;
|
||||
ret.scenario_progress = this->scenario_progress;
|
||||
ret.unused_offline_records = this->unused_offline_records;
|
||||
ret.unknown_a4 = this->unknown_a4;
|
||||
ret.is_encrypted = this->is_encrypted;
|
||||
ret.basis = this->basis;
|
||||
ret.unused = this->unused;
|
||||
ret.card_counts = this->card_counts;
|
||||
ret.card_count_checksums = this->card_count_checksums;
|
||||
ret.rare_tokens = this->rare_tokens;
|
||||
ret.decks = this->decks;
|
||||
ret.unknown_a8 = this->unknown_a8;
|
||||
ret.offline_clv_exp = this->offline_clv_exp;
|
||||
ret.online_clv_exp = this->online_clv_exp;
|
||||
ret.recent_human_opponents = this->recent_human_opponents;
|
||||
ret.unknown_a10 = this->unknown_a10;
|
||||
ret.init_timestamp = this->init_timestamp;
|
||||
ret.last_online_battle_start_timestamp = this->last_online_battle_start_timestamp;
|
||||
ret.unknown_t3 = this->unknown_t3;
|
||||
ret.unknown_a14 = this->unknown_a14;
|
||||
return ret;
|
||||
}
|
||||
|
||||
Rules::Rules(const JSON& json) {
|
||||
|
||||
@@ -967,7 +967,8 @@ struct PlayerConfigNTE {
|
||||
/* 1CC4 */ parray<uint8_t, 0x94> unknown_a14;
|
||||
/* 1D58 */
|
||||
|
||||
PlayerConfigNTE(const PlayerConfig& config);
|
||||
PlayerConfigNTE() = default;
|
||||
explicit PlayerConfigNTE(const PlayerConfig& config);
|
||||
operator PlayerConfig() const;
|
||||
|
||||
void decrypt();
|
||||
|
||||
+27
-27
@@ -287,33 +287,33 @@ PSOGCEp3CharacterFile::Character::Character(const PSOGCEp3NTECharacter& nte)
|
||||
}
|
||||
|
||||
PSOGCEp3CharacterFile::Character::operator PSOGCEp3NTECharacter() const {
|
||||
return {
|
||||
.inventory = this->inventory,
|
||||
.disp = this->disp,
|
||||
.flags = this->flags,
|
||||
.creation_timestamp = this->creation_timestamp,
|
||||
.signature = this->signature,
|
||||
.play_time_seconds = this->play_time_seconds,
|
||||
.option_flags = this->option_flags,
|
||||
.save_count = this->save_count,
|
||||
.ppp_username = this->ppp_username,
|
||||
.ppp_password = this->ppp_password,
|
||||
.seq_vars = this->seq_vars,
|
||||
.death_count = this->death_count,
|
||||
.bank = this->bank,
|
||||
.guild_card = this->guild_card,
|
||||
.symbol_chats = this->symbol_chats,
|
||||
.chat_shortcuts = this->chat_shortcuts,
|
||||
.auto_reply = this->auto_reply,
|
||||
.info_board = this->info_board,
|
||||
.battle_records = this->battle_records,
|
||||
.unknown_a10 = this->unknown_a10,
|
||||
.challenge_record_stats = this->challenge_record_stats,
|
||||
.ep3_config = this->ep3_config,
|
||||
.unknown_a11 = this->unknown_a11,
|
||||
.unknown_a12 = this->unknown_a12,
|
||||
.unknown_a13 = this->unknown_a13,
|
||||
};
|
||||
PSOGCEp3NTECharacter ret;
|
||||
ret.inventory = this->inventory;
|
||||
ret.disp = this->disp;
|
||||
ret.flags = this->flags;
|
||||
ret.creation_timestamp = this->creation_timestamp;
|
||||
ret.signature = this->signature;
|
||||
ret.play_time_seconds = this->play_time_seconds;
|
||||
ret.option_flags = this->option_flags;
|
||||
ret.save_count = this->save_count;
|
||||
ret.ppp_username = this->ppp_username;
|
||||
ret.ppp_password = this->ppp_password;
|
||||
ret.seq_vars = this->seq_vars;
|
||||
ret.death_count = this->death_count;
|
||||
ret.bank = this->bank;
|
||||
ret.guild_card = this->guild_card;
|
||||
ret.symbol_chats = this->symbol_chats;
|
||||
ret.chat_shortcuts = this->chat_shortcuts;
|
||||
ret.auto_reply = this->auto_reply;
|
||||
ret.info_board = this->info_board;
|
||||
ret.battle_records = this->battle_records;
|
||||
ret.unknown_a10 = this->unknown_a10;
|
||||
ret.challenge_record_stats = this->challenge_record_stats;
|
||||
ret.ep3_config = Episode3::PlayerConfigNTE(this->ep3_config);
|
||||
ret.unknown_a11 = this->unknown_a11;
|
||||
ret.unknown_a12 = this->unknown_a12;
|
||||
ret.unknown_a13 = this->unknown_a13;
|
||||
return ret;
|
||||
}
|
||||
|
||||
void PSOBBGuildCardFile::Entry::clear() {
|
||||
|
||||
@@ -565,6 +565,8 @@ struct PSOGCEp3NTECharacter {
|
||||
/* 4614:41F8 */ be_uint32_t unknown_a12 = 0;
|
||||
/* 4618:41FC */ be_uint32_t unknown_a13 = 0;
|
||||
/* 461C:4200 */
|
||||
|
||||
PSOGCEp3NTECharacter() = default;
|
||||
} __packed_ws__(PSOGCEp3NTECharacter, 0x461C);
|
||||
|
||||
struct PSOGCEp3CharacterFile {
|
||||
|
||||
Reference in New Issue
Block a user