phantop/doukutsu-rs
1
0
Fork 0
mirror of https://github.com/doukutsu-rs/doukutsu-rs synced 2024-09-27 12:38:57 +00:00
Code Issues Releases Wiki Activity

fix loading order

Browse source
This commit is contained in:
dawnDus 2022-04-30 11:54:48 -04:00
parent acad65d233
commit 2d2e712eab
No known key found for this signature in database
GPG key ID: 972AABDE81848F21
2 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/engine_constants/mod.rs
View file

@ -1796,12 +1796,11 @@ impl EngineConstants {
for language in Language::values() { for language in Language::values() {
// Only Switch 1.3+ data contains an entirely valid JP font // Only Switch 1.3+ data contains an entirely valid JP font
let font = let font = if language == Language::Japanese && filesystem::exists(ctx, "/base/credit_jp.tsc") {
if language == Language::Japanese && filesystem::exists_find(ctx, &self.base_paths, "/credit_jp.tsc") { FontData::new("csfontjp.fnt".to_owned(), 0.5, 0.0)
FontData::new("csfontjp.fnt".to_owned(), 0.5, 0.0) } else {
} else { language.font()
language.font() };
};
self.locales.insert(language.to_string(), Locale::new(ctx, language.to_language_code(), font)); self.locales.insert(language.to_string(), Locale::new(ctx, language.to_language_code(), font));
log::info!("Loaded locale {} ({}).", language.to_string(), language.to_language_code()); log::info!("Loaded locale {} ({}).", language.to_string(), language.to_language_code());
} }

4
src/shared_game_state.rs
View file

@ -317,11 +317,11 @@ impl SharedGameState {
} }
} }
constants.load_locales(ctx)?;
let season = Season::current(); let season = Season::current();
constants.rebuild_path_list(None, season, &settings); constants.rebuild_path_list(None, season, &settings);
constants.load_locales(ctx)?;
let active_locale = constants.locales.get(&settings.locale.to_string()).unwrap(); let active_locale = constants.locales.get(&settings.locale.to_string()).unwrap();
if constants.is_cs_plus { if constants.is_cs_plus {