aboutsummaryrefslogtreecommitdiff
path: root/src/io.rs
diff options
context:
space:
mode:
Diffstat (limited to 'src/io.rs')
-rw-r--r--src/io.rs15
1 files changed, 6 insertions, 9 deletions
diff --git a/src/io.rs b/src/io.rs
index 06775a2..8cc7b22 100644
--- a/src/io.rs
+++ b/src/io.rs
@@ -4,6 +4,7 @@ use std::{thread, time};
use crate::audio::MutableWave;
use crate::consts;
use crate::state::GBState;
+use crate::logs::{log, elog, LogLevel};
pub trait Input {
fn update_events(&mut self, cycles: u128) -> Option<u128>;
@@ -108,10 +109,10 @@ impl<I: Input, W: Window, S: Serial, A: Audio, LS: LoadSave> Gameboy<I, W, S, A,
gb.load_save.load_rom(gb.state.mem.rom.as_mut()).unwrap();
if let Err(err) = gb.load_save.load_external_ram(gb.state.mem.external_ram.as_mut()) {
- println!(
+ log(LogLevel::Infos, format!(
"Loading save failed ({}). Initializing new external ram.",
err
- );
+ ));
}
gb
@@ -128,10 +129,6 @@ impl<I: Input, W: Window, S: Serial, A: Audio, LS: LoadSave> Gameboy<I, W, S, A,
Ok(())
}
- pub fn debug(&mut self) {
- self.state.is_debug = true;
- }
-
pub fn skip_bootrom(&mut self) {
self.state.mem.boot_rom_on = false;
self.state.cpu.pc = 0x100;
@@ -158,7 +155,7 @@ impl<I: Input, W: Window, S: Serial, A: Audio, LS: LoadSave> Gameboy<I, W, S, A,
while !state.is_stopped {
if was_previously_halted && !state.mem.halt {
- println!("Halt cycles {}", halt_time);
+ log(LogLevel::HaltCycles, format!("Halt cycles {}", halt_time));
halt_time = 0;
}
was_previously_halted = state.mem.halt;
@@ -199,7 +196,7 @@ impl<I: Input, W: Window, S: Serial, A: Audio, LS: LoadSave> Gameboy<I, W, S, A,
if save_state {
if let Err(err) = load_save.save_state(&state) {
- eprintln!("FAILED SAVE STATE: {:?}", err);
+ elog(LogLevel::Error, format!("Failed save state: {:?}", err));
}
}
@@ -231,7 +228,7 @@ impl<I: Input, W: Window, S: Serial, A: Audio, LS: LoadSave> Gameboy<I, W, S, A,
if last_ram_bank_enabled && !state.mem.ram_bank_enabled {
if let Err(err) = load_save.save_external_ram(state.mem.external_ram.as_ref()) {
- println!("Failed to save external RAM ({})", err);
+ elog(LogLevel::Error, format!("Failed to save external RAM ({})", err));
}
}
last_ram_bank_enabled = state.mem.ram_bank_enabled;