phantop/doukutsu-rs
1
0
Fork 0
mirror of https://github.com/doukutsu-rs/doukutsu-rs synced 2024-11-22 05:33:02 +00:00
Code Issues Releases Wiki Activity

Fix #208 and add a different log level for file logging

Browse source
This commit is contained in:
biroder 2023-05-29 10:42:34 +03:00
parent 19e0da519f
commit 50ff888141
3 changed files with 23 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/engine_constants/mod.rs
View file

@ -1759,6 +1759,10 @@ impl EngineConstants {
let _ = sound_manager.set_sample_params(2, typewriter_sample); let _ = sound_manager.set_sample_params(2, typewriter_sample);
} }
pub fn is_base(&self) -> bool {
!self.is_switch && !self.is_cs_plus && !self.is_demo
}
pub fn apply_csplus_nx_patches(&mut self) { pub fn apply_csplus_nx_patches(&mut self) {
log::info!("Applying Switch-specific Cave Story+ constants patches..."); log::info!("Applying Switch-specific Cave Story+ constants patches...");

14
src/game/mod.rs
View file

@ -267,8 +267,12 @@ fn init_logger() -> GameResult {
message message
)) ))
}) })
.level(log::LevelFilter::Info) .level(log::LevelFilter::Debug)
.chain(std::io::stderr()); .chain(
fern::Dispatch::new()
.level(log::LevelFilter::Info)
.chain(std::io::stderr())
);
let date = chrono::Utc::now(); let date = chrono::Utc::now();
@ -276,7 +280,11 @@ fn init_logger() -> GameResult {
file.push(format!("log_{}", date.format("%Y-%m-%d"))); file.push(format!("log_{}", date.format("%Y-%m-%d")));
file.set_extension("txt"); file.set_extension("txt");
dispatcher = dispatcher.chain(fern::log_file(file).unwrap()); dispatcher = dispatcher.chain(
fern::Dispatch::new()
.level(log::LevelFilter::Debug)
.chain(fern::log_file(file).unwrap())
);
dispatcher.apply()?; dispatcher.apply()?;
//log::info!("===GAME LAUNCH==="); //log::info!("===GAME LAUNCH===");

16
src/game/shared_game_state.rs
View file

@ -409,11 +409,11 @@ impl SharedGameState {
constants.load_locales(ctx)?; constants.load_locales(ctx)?;
let locale = SharedGameState::get_locale(&constants, &settings.locale).unwrap_or_default(); let locale = SharedGameState::get_locale(&constants, &settings.locale).unwrap_or_default();
constants.textscript.encoding = if locale.code == "jp" && !constants.is_switch { if (locale.code == "jp" || locale.code == "en") && constants.is_base() {
TextScriptEncoding::ShiftJIS constants.textscript.encoding = TextScriptEncoding::ShiftJIS
} else { } else {
TextScriptEncoding::UTF8 constants.textscript.encoding = TextScriptEncoding::UTF8
}; }
let font = BMFont::load(&constants.base_paths, &locale.font.path, ctx, locale.font.scale).or_else(|e| { let font = BMFont::load(&constants.base_paths, &locale.font.path, ctx, locale.font.scale).or_else(|e| {
log::warn!("Failed to load font, using built-in: {}", e); log::warn!("Failed to load font, using built-in: {}", e);
@ -561,11 +561,11 @@ impl SharedGameState {
pub fn update_locale(&mut self, ctx: &mut Context) { pub fn update_locale(&mut self, ctx: &mut Context) {
if let Some(locale) = SharedGameState::get_locale(&self.constants, &self.settings.locale) { if let Some(locale) = SharedGameState::get_locale(&self.constants, &self.settings.locale) {
self.loc = locale; self.loc = locale;
self.constants.textscript.encoding = if self.loc.code == "jp" && !self.constants.is_switch { if (self.loc.code == "jp" || self.loc.code == "en") && self.constants.is_base() {
TextScriptEncoding::ShiftJIS self.constants.textscript.encoding = TextScriptEncoding::ShiftJIS
} else { } else {
TextScriptEncoding::UTF8 self.constants.textscript.encoding = TextScriptEncoding::UTF8
}; }
} }
let font = BMFont::load(&self.constants.base_paths, &self.loc.font.path, ctx, self.loc.font.scale) let font = BMFont::load(&self.constants.base_paths, &self.loc.font.path, ctx, self.loc.font.scale)