phantop/doukutsu-rs
1
0
Fork 0
mirror of https://github.com/doukutsu-rs/doukutsu-rs synced 2025-04-01 07:16:57 +00:00
Code Issues Releases Wiki Activity

Disable debug hotkeys in non-debug mode, fix Balrog text scrolling sound from #165

Browse source
This commit is contained in:
biroder 2023-09-25 14:30:12 +03:00
parent 21221d80e7
commit 3468bcf5fd
3 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/game/mod.rs
View file

@ -269,7 +269,6 @@ fn init_logger() -> GameResult {
.level(log::LevelFilter::Debug)
.chain(
fern::Dispatch::new()
.level(log::LevelFilter::Info)
.chain(std::io::stderr())
);
@ -281,7 +280,7 @@ fn init_logger() -> GameResult {
dispatcher = dispatcher.chain(
fern::Dispatch::new()
.level(log::LevelFilter::Debug)
.level(log::LevelFilter::Info)
.chain(fern::log_file(file).unwrap())
);
dispatcher.apply()?;

6
src/game/scripting/tsc/text_script.rs
View file

@ -459,7 +459,11 @@ impl TextScriptVM {
} else {
state.constants.textscript.text_speed_fast
};
if ticks > 0 {
state.sound_manager.play_sfx(2);
}
state.textscript_vm.state = if new_line {
TextScriptExecutionState::MsgNewLine(
event,

10
src/scene/game_scene.rs
View file

@ -2308,6 +2308,11 @@ impl Scene for GameScene {
}
fn process_debug_keys(&mut self, state: &mut SharedGameState, ctx: &mut Context, key_code: ScanCode) -> GameResult {
#[cfg(not(debug_assertions))]
if !state.settings.debug_mode {
return Ok(());
}
if key_code == ScanCode::F3 && ctx.keyboard_context.active_mods().ctrl() {
let _ = state.sound_manager.reload();
return Ok(());
@ -2319,11 +2324,6 @@ impl Scene for GameScene {
return Ok(());
}
#[cfg(not(debug_assertions))]
if !state.settings.debug_mode {
return Ok(());
}
match key_code {
ScanCode::F3 => state.settings.god_mode = !state.settings.god_mode,
ScanCode::F4 => state.settings.infinite_booster = !state.settings.infinite_booster,