mirror of
https://github.com/gopher64/gopher64.git
synced 2026-09-23 21:06:37 +02:00
remove session reference for netplay
This commit is contained in:
+1
-3
@@ -247,11 +247,9 @@ fn process_incoming(netplay: &mut Netplay, ui: &ui::Ui) {
|
||||
}
|
||||
|
||||
pub fn init(
|
||||
mut peer_addr: std::net::SocketAddr,
|
||||
session: ui::gui::gui_netplay::NetplayRoom,
|
||||
peer_addr: std::net::SocketAddr,
|
||||
player_number: u8,
|
||||
) -> Netplay {
|
||||
peer_addr.set_port(session.port.unwrap() as u16);
|
||||
let udp_socket;
|
||||
if peer_addr.is_ipv4() {
|
||||
udp_socket = std::net::UdpSocket::bind((std::net::Ipv4Addr::UNSPECIFIED, 0))
|
||||
|
||||
+2
-5
@@ -290,8 +290,7 @@ pub fn open_rom(app: &mut GopherEguiApp, ctx: &egui::Context, enable_overclock:
|
||||
let crt = app.crt;
|
||||
let emulate_vru = app.emulate_vru;
|
||||
let overclock = app.overclock;
|
||||
let peer_addr;
|
||||
let session;
|
||||
let mut peer_addr;
|
||||
let player_number;
|
||||
let cache_dir = app.dirs.cache_dir.clone();
|
||||
let controller_paths = app.controller_paths.clone();
|
||||
@@ -299,12 +298,11 @@ pub fn open_rom(app: &mut GopherEguiApp, ctx: &egui::Context, enable_overclock:
|
||||
if app.netplay.player_name.is_empty() {
|
||||
netplay = false;
|
||||
peer_addr = None;
|
||||
session = None;
|
||||
player_number = None;
|
||||
} else {
|
||||
netplay = true;
|
||||
peer_addr = app.netplay.peer_addr;
|
||||
session = app.netplay.waiting_session.clone();
|
||||
peer_addr.as_mut().unwrap().set_port(app.netplay.waiting_session.as_ref().unwrap().port.unwrap() as u16);
|
||||
player_number = Some(app.netplay.player_number);
|
||||
}
|
||||
|
||||
@@ -406,7 +404,6 @@ pub fn open_rom(app: &mut GopherEguiApp, ctx: &egui::Context, enable_overclock:
|
||||
if netplay {
|
||||
device.netplay = Some(netplay::init(
|
||||
peer_addr.unwrap(),
|
||||
session.unwrap(),
|
||||
player_number.unwrap(),
|
||||
));
|
||||
device::run_game(&mut device, rom_contents, fullscreen, enable_overclock);
|
||||
|
||||
Reference in New Issue
Block a user