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

don't use format_data_string to serialize non-English strings

Browse Source
This commit is contained in:
Martin Michelsen
2023-10-26 00:48:29 -07:00
parent 20d709686a
commit 700b1497d6
2 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Episode3/DataIndexes.cc
+12 -12
View File
@@ -1692,14 +1692,14 @@ string MapDefinition::str(const CardIndex* card_index, uint8_t language) const {
" a5[0x70:0x74]: %02hhX %02hhX %02hhX %02hhX", " a5[0x70:0x74]: %02hhX %02hhX %02hhX %02hhX",
this->unknown_a5[0x70], this->unknown_a5[0x71], this->unknown_a5[0x72], this->unknown_a5[0x73])); this->unknown_a5[0x70], this->unknown_a5[0x71], this->unknown_a5[0x72], this->unknown_a5[0x73]));
lines.emplace_back(" default_rules: " + this->default_rules.str()); lines.emplace_back(" default_rules: " + this->default_rules.str());
lines.emplace_back(" name: " + format_data_string(this->name.decode(language))); lines.emplace_back(" name: " + this->name.decode(language));
lines.emplace_back(" location_name: " + format_data_string(this->location_name.decode(language))); lines.emplace_back(" location_name: " + this->location_name.decode(language));
lines.emplace_back(" quest_name: " + format_data_string(this->quest_name.decode(language))); lines.emplace_back(" quest_name: " + this->quest_name.decode(language));
lines.emplace_back(" description: " + format_data_string(this->description.decode(language))); lines.emplace_back(" description: " + this->description.decode(language));
lines.emplace_back(string_printf(" map_xy: %hu %hu", this->map_x.load(), this->map_y.load())); lines.emplace_back(string_printf(" map_xy: %hu %hu", this->map_x.load(), this->map_y.load()));
for (size_t z = 0; z < 3; z++) { for (size_t z = 0; z < 3; z++) {
lines.emplace_back(string_printf(" npc_chars[%zu]:", z)); lines.emplace_back(string_printf(" npc_chars[%zu]:", z));
lines.emplace_back(" name: " + format_data_string(this->npc_ai_params[z].name.decode(language))); lines.emplace_back(" name: " + this->npc_ai_params[z].name.decode(language));
lines.emplace_back(string_printf( lines.emplace_back(string_printf(
" ai_params: (a1: %04hX %04hX, is_arkz: %02hhX, a2: %02hX %02hX %02hX)", " ai_params: (a1: %04hX %04hX, is_arkz: %02hhX, a2: %02hX %02hX %02hX)",
this->npc_ai_params[z].unknown_a1[0].load(), this->npc_ai_params[z].unknown_a1[1].load(), this->npc_ai_params[z].unknown_a1[0].load(), this->npc_ai_params[z].unknown_a1[1].load(),
@@ -1720,7 +1720,7 @@ string MapDefinition::str(const CardIndex* card_index, uint8_t language) const {
this->npc_ai_params[z].params[0x7A].load(), this->npc_ai_params[z].params[0x7B].load(), this->npc_ai_params[z].params[0x7A].load(), this->npc_ai_params[z].params[0x7B].load(),
this->npc_ai_params[z].params[0x7C].load(), this->npc_ai_params[z].params[0x7D].load())); this->npc_ai_params[z].params[0x7C].load(), this->npc_ai_params[z].params[0x7D].load()));
lines.emplace_back(string_printf(" npc_decks[%zu]:", z)); lines.emplace_back(string_printf(" npc_decks[%zu]:", z));
lines.emplace_back(" name: " + format_data_string(this->npc_decks[z].name.decode(language))); lines.emplace_back(" name: " + this->npc_decks[z].name.decode(language));
for (size_t w = 0; w < 0x20; w++) { for (size_t w = 0; w < 0x20; w++) {
uint16_t card_id = this->npc_decks[z].card_ids[w]; uint16_t card_id = this->npc_decks[z].card_ids[w];
shared_ptr<const CardIndex::CardEntry> entry; shared_ptr<const CardIndex::CardEntry> entry;
@@ -1746,8 +1746,8 @@ string MapDefinition::str(const CardIndex* card_index, uint8_t language) const {
z, x, set.when.load(), set.percent_chance.load())); z, x, set.when.load(), set.percent_chance.load()));
for (size_t w = 0; w < 4; w++) { for (size_t w = 0; w < 4; w++) {
if (!set.strings[w].empty() && set.strings[w].at(0) != 0xFF) { if (!set.strings[w].empty() && set.strings[w].at(0) != 0xFF) {
string escaped = format_data_string(set.strings[w].decode(language)); string s = set.strings[w].decode(language);
lines.emplace_back(string_printf(" strings[%zu]: %s", w, escaped.c_str())); lines.emplace_back(string_printf(" strings[%zu]: %s", w, s.c_str()));
} }
} }
} }
@@ -1756,13 +1756,13 @@ string MapDefinition::str(const CardIndex* card_index, uint8_t language) const {
lines.emplace_back(string_printf(" npc_ai_params_entry_index: [%08" PRIX32 ", %08" PRIX32 ", %08" PRIX32 "]", lines.emplace_back(string_printf(" npc_ai_params_entry_index: [%08" PRIX32 ", %08" PRIX32 ", %08" PRIX32 "]",
this->npc_ai_params_entry_index[0].load(), this->npc_ai_params_entry_index[1].load(), this->npc_ai_params_entry_index[2].load())); this->npc_ai_params_entry_index[0].load(), this->npc_ai_params_entry_index[1].load(), this->npc_ai_params_entry_index[2].load()));
if (!this->before_message.empty()) { if (!this->before_message.empty()) {
lines.emplace_back(" before_message: " + format_data_string(this->before_message.decode(language))); lines.emplace_back(" before_message: " + this->before_message.decode(language));
} }
if (!this->after_message.empty()) { if (!this->after_message.empty()) {
lines.emplace_back(" after_message: " + format_data_string(this->after_message.decode(language))); lines.emplace_back(" after_message: " + this->after_message.decode(language));
} }
if (!this->dispatch_message.empty()) { if (!this->dispatch_message.empty()) {
lines.emplace_back(" dispatch_message: " + format_data_string(this->dispatch_message.decode(language))); lines.emplace_back(" dispatch_message: " + this->dispatch_message.decode(language));
} }
for (size_t z = 0; z < 0x10; z++) { for (size_t z = 0; z < 0x10; z++) {
uint16_t card_id = this->reward_card_ids[z]; uint16_t card_id = this->reward_card_ids[z];
@@ -2511,7 +2511,7 @@ MapIndex::MapIndex(const string& directory) {
throw runtime_error("unknown map file format"); throw runtime_error("unknown map file format");
} }
string name = format_data_string(vm->map->name.decode(vm->language)); string name = vm->map->name.decode(vm->language);
auto map_it = this->maps.find(vm->map->map_number); auto map_it = this->maps.find(vm->map->map_number);
if (map_it == this->maps.end()) { if (map_it == this->maps.end()) {
map_it = this->maps.emplace(vm->map->map_number, new Map(vm)).first; map_it = this->maps.emplace(vm->map->map_number, new Map(vm)).first;
src/Quest.cc
+4 -5
View File
@@ -675,7 +675,6 @@ QuestIndex::QuestIndex(
shared_ptr<VersionedQuest> vq(new VersionedQuest( shared_ptr<VersionedQuest> vq(new VersionedQuest(
quest_number, category_id, version, language, bin_contents, dat_contents, battle_rules, challenge_template_index)); quest_number, category_id, version, language, bin_contents, dat_contents, battle_rules, challenge_template_index));
string ascii_name = format_data_string(vq->name);
auto category_name = this->category_index->at(vq->category_id).name; auto category_name = this->category_index->at(vq->category_id).name;
string dat_str = dat_filename.empty() ? "" : (" with layout " + dat_filename); string dat_str = dat_filename.empty() ? "" : (" with layout " + dat_filename);
@@ -684,23 +683,23 @@ QuestIndex::QuestIndex(
auto q_it = this->quests_by_number.find(vq->quest_number); auto q_it = this->quests_by_number.find(vq->quest_number);
if (q_it != this->quests_by_number.end()) { if (q_it != this->quests_by_number.end()) {
q_it->second->add_version(vq); q_it->second->add_version(vq);
static_game_data_log.info("(%s) Added %s %c version of quest %" PRIu32 " %s%s%s%s", static_game_data_log.info("(%s) Added %s %c version of quest %" PRIu32 " (%s)%s%s%s",
bin_filename.c_str(), bin_filename.c_str(),
name_for_enum(vq->version), name_for_enum(vq->version),
char_for_language_code(vq->language), char_for_language_code(vq->language),
vq->quest_number, vq->quest_number,
ascii_name.c_str(), vq->name.c_str(),
dat_str.c_str(), dat_str.c_str(),
battle_rules_str.c_str(), battle_rules_str.c_str(),
challenge_template_str.c_str()); challenge_template_str.c_str());
} else { } else {
this->quests_by_number.emplace(vq->quest_number, new Quest(vq)); this->quests_by_number.emplace(vq->quest_number, new Quest(vq));
static_game_data_log.info("(%s) Created %s %c quest %" PRIu32 " %s (%s, %s (%" PRIu32 "), %s)%s%s%s", static_game_data_log.info("(%s) Created %s %c quest %" PRIu32 " (%s) (%s, %s (%" PRIu32 "), %s)%s%s%s",
bin_filename.c_str(), bin_filename.c_str(),
name_for_enum(vq->version), name_for_enum(vq->version),
char_for_language_code(vq->language), char_for_language_code(vq->language),
vq->quest_number, vq->quest_number,
ascii_name.c_str(), vq->name.c_str(),
name_for_episode(vq->episode), name_for_episode(vq->episode),
category_name.c_str(), category_name.c_str(),
vq->category_id, vq->category_id,