dont pass fullscreen

This commit is contained in:
Logan McNaughton 2026-03-31 11:38:36 +02:00
parent ad5dc8311a
commit 5177aaab53
4 changed files with 5 additions and 22 deletions

View File

@ -45,7 +45,6 @@ pub mod unmapped;
pub mod vi;
pub fn run_game(device: &mut Device, rom_contents: Vec<u8>, 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;

View File

@ -18,7 +18,7 @@ use ui::gui;
struct Args {
game: Option<String>,
#[arg(short, long)]
fullscreen: Option<bool>,
fullscreen: bool,
#[arg(long)]
overclock: Option<bool>,
#[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,

View File

@ -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<String, Option<String>>,
@ -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

View File

@ -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<AppWindow>,
weak: slint::Weak<NetplayJoin>,
) {
@ -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<AppWindow>,
) {
@ -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<String>]) {
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<String>]) {
.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();
});