diff --git a/src/device.rs b/src/device.rs index b9801f5..4c1462a 100644 --- a/src/device.rs +++ b/src/device.rs @@ -45,7 +45,6 @@ pub mod unmapped; pub mod vi; pub fn run_game(device: &mut Device, rom_contents: Vec, game_settings: ui::gui::GameSettings) { - device.ui.video.fullscreen = game_settings.fullscreen; device.cpu.overclock = game_settings.overclock; if game_settings.disable_expansion_pak { device.rdram.size = 0x400000; diff --git a/src/main.rs b/src/main.rs index 36b139d..9bae922 100644 --- a/src/main.rs +++ b/src/main.rs @@ -18,7 +18,7 @@ use ui::gui; struct Args { game: Option, #[arg(short, long)] - fullscreen: Option, + fullscreen: bool, #[arg(long)] overclock: Option, #[arg(long)] @@ -109,7 +109,9 @@ async fn main() -> std::io::Result<()> { } let mut device = device::Device::new(); - let fullscreen = args.fullscreen.unwrap_or(device.ui.config.video.fullscreen); + if args.fullscreen { + device.ui.video.fullscreen = true; + } let overclock = args .overclock .unwrap_or(device.ui.config.emulation.overclock); @@ -159,7 +161,6 @@ async fn main() -> std::io::Result<()> { &mut device, rom_contents, ui::gui::GameSettings { - fullscreen, overclock, disable_expansion_pak, cheats, diff --git a/src/ui/gui.rs b/src/ui/gui.rs index acdf369..8b83b86 100644 --- a/src/ui/gui.rs +++ b/src/ui/gui.rs @@ -24,7 +24,6 @@ pub struct GbPaths { #[derive(Clone)] pub struct GameSettings { - pub fullscreen: bool, pub overclock: bool, pub disable_expansion_pak: bool, pub cheats: std::collections::HashMap>, @@ -331,8 +330,6 @@ pub fn run_rom( let mut command = std::process::Command::new(std::env::current_exe().unwrap()); command.args([ - "--fullscreen", - &game_settings.fullscreen.to_string(), "--overclock", &game_settings.overclock.to_string(), "--disable-expansion-pak", @@ -416,7 +413,6 @@ fn open_rom(app: &AppWindow) { } } - let fullscreen = app.get_fullscreen(); let overclock = app.get_overclock_n64_cpu(); let disable_expansion_pak = app.get_disable_expansion_pak(); @@ -443,7 +439,6 @@ fn open_rom(app: &AppWindow) { }, file.path().to_path_buf(), GameSettings { - fullscreen, overclock, disable_expansion_pak, cheats: std::collections::HashMap::new(), // will be filled in later diff --git a/src/ui/netplay.rs b/src/ui/netplay.rs index a09a7e4..83f6c34 100644 --- a/src/ui/netplay.rs +++ b/src/ui/netplay.rs @@ -711,7 +711,6 @@ fn create_session( message.player_name.as_ref().unwrap().into(), session.port.unwrap(), GameSettings { - fullscreen: game_settings.fullscreen, overclock: overclock.parse().unwrap(), disable_expansion_pak: disable_expansion_pak.parse().unwrap(), cheats: serde_json::from_str(cheats).unwrap(), @@ -755,7 +754,6 @@ fn join_session( game_hash: String, password: String, room_port: i32, - fullscreen: bool, weak_app: slint::Weak, weak: slint::Weak, ) { @@ -834,7 +832,6 @@ fn join_session( message.player_name.as_ref().unwrap().into(), session.port.unwrap(), GameSettings { - fullscreen, overclock: overclock.parse().unwrap(), disable_expansion_pak: disable_expansion_pak.parse().unwrap(), cheats: serde_json::from_str(cheats).unwrap(), @@ -1102,7 +1099,6 @@ fn setup_wait_window( }, handle.get_rom_path().as_str().into(), GameSettings { - fullscreen: game_settings.fullscreen, overclock: game_settings.overclock, disable_expansion_pak: game_settings.disable_expansion_pak, cheats: game_settings.cheats, @@ -1153,7 +1149,6 @@ fn setup_wait_window( pub fn setup_join_window( join_window: &NetplayJoin, - fullscreen: bool, rom_dir: slint::SharedString, weak_app: slint::Weak, ) { @@ -1202,7 +1197,6 @@ pub fn setup_join_window( game_hash.to_string(), password.to_string(), room_port, - fullscreen, weak_app.clone(), weak.clone(), ); @@ -1226,7 +1220,6 @@ pub fn netplay_window(app: &AppWindow, controller_paths: &[Option]) { setup_create_window( &create_window, GameSettings { - fullscreen: handle.get_fullscreen(), overclock: handle.get_overclock_n64_cpu(), disable_expansion_pak: handle.get_disable_expansion_pak(), cheats: std::collections::HashMap::new(), // not used here @@ -1249,12 +1242,7 @@ pub fn netplay_window(app: &AppWindow, controller_paths: &[Option]) { .upgrade_in_event_loop(move |handle| { let join_window = NetplayJoin::new().unwrap(); save_settings(&handle, &controller_paths); - setup_join_window( - &join_window, - handle.get_fullscreen(), - handle.get_rom_dir(), - weak_app, - ); + setup_join_window(&join_window, handle.get_rom_dir(), weak_app); }) .unwrap(); });