pbwraith/gopher64-netplay
Archived
1
0
Fork 0
Code Issues Pull Requests 3 Actions Packages Projects Releases Wiki Activity

remove unused param (#749)

Browse Source
This commit is contained in:
Logan McNaughton 2026-04-15 13:39:49 +02:00 committed by GitHub
parent 451d66beee
commit d2e47509b2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
9 changed files with 13 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/cheats.rs
View File

@ -71,7 +71,7 @@ pub fn init(
if !device.cheats.cheats.is_empty() {
device.cheats.enabled = true;
ui::video::onscreen_message(&device.ui, "Cheats enabled", false);
ui::video::onscreen_message("Cheats enabled", false);
}
}

6
src/device/controller.rs
View File

@ -190,21 +190,21 @@ pub fn pak_switch_event(device: &mut device::Device) {
write: device::controller::mempak::write,
pak_type: new_pak_type,
});
ui::video::onscreen_message(&device.ui, "MemPak selected", false);
ui::video::onscreen_message("MemPak selected", false);
} else if new_pak_type == PakType::RumblePak {
channel.pak_handler = Some(device::controller::PakHandler {
read: device::controller::rumble::read,
write: device::controller::rumble::write,
pak_type: new_pak_type,
});
ui::video::onscreen_message(&device.ui, "RumblePak selected", false);
ui::video::onscreen_message("RumblePak selected", false);
} else if new_pak_type == PakType::TransferPak {
channel.pak_handler = Some(device::controller::PakHandler {
read: device::controller::transferpak::read,
write: device::controller::transferpak::write,
pak_type: new_pak_type,
});
ui::video::onscreen_message(&device.ui, "TransferPak selected", false);
ui::video::onscreen_message("TransferPak selected", false);
}
channel.change_pak = PakType::None;
}

6
src/device/cpu.rs
View File

@ -227,11 +227,7 @@ pub fn init(device: &mut device::Device) {
device.cpu.clock_rate = if !device.cpu.overclock {
93750000
} else {
ui::video::onscreen_message(
&device.ui,
"Overclocking enabled, setting clock rate to 125 MHz",
false,
);
ui::video::onscreen_message("Overclocking enabled, setting clock rate to 125 MHz", false);
125000000
};

2
src/device/exceptions.rs
View File

@ -166,7 +166,7 @@ pub fn reset_event(device: &mut device::Device) {
device::pif::reset_pif(device, true);
ui::video::onscreen_message(&device.ui, "Game reset", false);
ui::video::onscreen_message("Game reset", false);
}
fn exception_general(device: &mut device::Device, vector_offset: u32) {

2
src/device/vi.rs
View File

@ -151,7 +151,7 @@ pub fn vertical_interrupt_event(device: &mut device::Device) {
if device.netplay.is_none() && paused {
if retroachievements::get_hardcore() {
ui::video::onscreen_message(&device.ui, "Cannot pause in RA hardcore mode", false);
ui::video::onscreen_message("Cannot pause in RA hardcore mode", false);
} else {
ui::video::pause_loop(device.vi.frame_time);
}

9
src/netplay.rs
View File

@ -135,7 +135,7 @@ pub fn get_input(device: &mut device::Device, channel: usize) -> ui::input::Inpu
let timeout = std::time::Instant::now() + std::time::Duration::from_secs(10);
let mut request_timer = std::time::Instant::now() - std::time::Duration::from_millis(5);
while input.is_none() {
process_incoming(netplay, &device.ui); // we execute process_incoming before request_input so that we send an accurate buffer count
process_incoming(netplay); // we execute process_incoming before request_input so that we send an accurate buffer count
if std::time::Instant::now() > request_timer {
// sends a request packet every 5ms
request_input(netplay, channel);
@ -146,7 +146,7 @@ pub fn get_input(device: &mut device::Device, channel: usize) -> ui::input::Inpu
.remove(&netplay.player_data[channel].count);
if std::time::Instant::now() > timeout {
ui::video::onscreen_message(&device.ui, "Lost connection to netplay server", false);
ui::video::onscreen_message("Lost connection to netplay server", false);
input = Some(InputEvent {
input: 0,
plugin: 0,
@ -177,7 +177,7 @@ fn request_input(netplay: &Netplay, channel: usize) {
netplay.udp_socket.send(&request).unwrap();
}
fn process_incoming(netplay: &mut Netplay, ui: &ui::Ui) {
fn process_incoming(netplay: &mut Netplay) {
let mut buf: [u8; 1024] = [0; 1024];
while let Ok(_incoming) = netplay.udp_socket.recv(&mut buf) {
match buf[0] {
@ -191,13 +191,12 @@ fn process_incoming(netplay: &mut Netplay, ui: &ui::Ui) {
}
if current_status != netplay.status {
if ((current_status & 0x1) ^ (netplay.status & 0x1)) != 0 {
ui::video::onscreen_message(ui, "Netplay desync detected", true);
ui::video::onscreen_message("Netplay desync detected", true);
}
for dis in 1..5 {
if ((current_status & (0x1 << dis)) ^ (netplay.status & (0x1 << dis))) != 0
{
ui::video::onscreen_message(
ui,
&format!("Player {dis} disconnected"),
false,
);

10
src/savestates.rs
View File

@ -91,7 +91,6 @@ pub fn create_savestate(device: &device::Device) {
tokio::fs::write(save_path, compressed_file).await.unwrap();
});
ui::video::onscreen_message(
&device.ui,
&format!(
"Savestate created in slot {}",
device.ui.storage.save_state_slot
@ -102,11 +101,7 @@ pub fn create_savestate(device: &device::Device) {
pub fn load_savestate(device: &mut device::Device) {
if retroachievements::get_hardcore() {
ui::video::onscreen_message(
&device.ui,
"Cannot load savestate in RA hardcore mode",
false,
);
ui::video::onscreen_message("Cannot load savestate in RA hardcore mode", false);
return;
}
let savestate = std::fs::read(&device.ui.storage.paths.savestate_file_path);
@ -217,7 +212,6 @@ pub fn load_savestate(device: &mut device::Device) {
}
ui::video::onscreen_message(
&device.ui,
&format!(
"Savestate loaded from slot {}",
device.ui.storage.save_state_slot
@ -226,7 +220,6 @@ pub fn load_savestate(device: &mut device::Device) {
);
} else {
ui::video::onscreen_message(
&device.ui,
&format!(
"Failed to load savestate from slot {}",
device.ui.storage.save_state_slot
@ -236,7 +229,6 @@ pub fn load_savestate(device: &mut device::Device) {
}
} else {
ui::video::onscreen_message(
&device.ui,
&format!(
"Could not find savestate in slot {}",
device.ui.storage.save_state_slot

2
src/ui/audio.rs
View File

@ -54,7 +54,6 @@ pub fn lower_audio_volume(ui: &mut ui::Ui) {
sdl3_sys::audio::SDL_SetAudioStreamGain(ui.audio.audio_stream, ui.audio.gain);
}
ui::video::onscreen_message(
ui,
&format!("Audio volume: {:.0}%", ui.audio.gain * 100.0),
false,
);
@ -69,7 +68,6 @@ pub fn raise_audio_volume(ui: &mut ui::Ui) {
sdl3_sys::audio::SDL_SetAudioStreamGain(ui.audio.audio_stream, ui.audio.gain);
}
ui::video::onscreen_message(
ui,
&format!("Audio volume: {:.0}%", ui.audio.gain * 100.0),
false,
);

3
src/ui/video.rs
View File

@ -180,7 +180,6 @@ pub fn check_callback(device: &mut device::Device) -> (bool, bool) {
if device.ui.storage.save_state_slot != callback.save_state_slot {
onscreen_message(
&device.ui,
&format!("Switching savestate slot to {}", callback.save_state_slot),
false,
);
@ -214,7 +213,7 @@ pub fn check_framebuffers(address: u32, length: u32) {
unsafe { rdp_check_framebuffers(address, length) }
}
pub fn onscreen_message(_ui: &ui::Ui, message: &str, long_message: bool) {
pub fn onscreen_message(message: &str, long_message: bool) {
unsafe {
let c_message = std::ffi::CString::new(message).unwrap();
rdp_onscreen_message(c_message.as_ptr(), long_message)