szymon/checkers
1
0
Fork 0
mirror of https://github.com/szymon-jozef/checkers.git synced 2026-10-27 19:20:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

refactor: server message handling into its own methods

Browse Source
This commit is contained in:
szymon
2026-08-17 14:10:28 +02:00
parent ffcab4f58b
commit a12f1fce4d
1 changed files with 27 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/network/server.rs
View File

@@ -182,31 +182,11 @@ impl Server {
} }
ClientMessage::ConnectionDead { addr } => { ClientMessage::ConnectionDead { addr } => {
warn!("Removing: {:?} from connection list", addr);
// TODO! Should decrement ready_counter if player was ready. But
// how to check that? Maybe create new struct that will hold
// sender and ready and maybe some other data.
let is_ready = &mut self.connections.get_mut(&addr).expect("Couldn't get the identity of disconnected player. I don't think i should panic but i don't care fuck you").identity.is_ready;
if *is_ready {
*is_ready = false;
self.state.ready_count -= 1;
info!("Currently {}/{} players are ready", self.state.ready_count, self.settings.max_connections);
}
self.remove_client(addr); self.remove_client(addr);
}, },
ClientMessage::SignalReadiness => { ClientMessage::SignalReadiness => {
self.state.ready_count += 1; self.handle_readiness(addr)
info!("{} signaled readiness. Currently ready: {}/{}", addr, self.state.ready_count, self.settings.max_connections);
self.connections.get_mut(&addr).expect("Couldn't get the identity of the ready player. I guess this should never happen so i'm panicking like a little bitch").identity.is_ready = true;
if self.state.ready_count == self.settings.max_connections {
info!("All players are ready! Changing state to ServerStage::Game");
self.state.stage = ServerStage::Game;
self.start_game();
}
}, },
ClientMessage::RequestCapture { capture_path } => { ClientMessage::RequestCapture { capture_path } => {
@@ -313,7 +293,33 @@ impl Server {
}; };
} }
fn handle_readiness(&mut self, addr: SocketAddr) {
self.state.ready_count += 1;
info!(
"{} signaled readiness. Currently ready: {}/{}",
addr, self.state.ready_count, self.settings.max_connections
);
self.connections.get_mut(&addr).expect("Couldn't get the identity of the ready player. I guess this should never happen so i'm panicking like a little bitch").identity.is_ready = true;
if self.state.ready_count == self.settings.max_connections {
info!("All players are ready! Changing state to ServerStage::Game");
self.state.stage = ServerStage::Game;
self.start_game();
}
}
fn remove_client(&mut self, addr: SocketAddr) { fn remove_client(&mut self, addr: SocketAddr) {
warn!("Removing: {:?} from connection list", addr);
let is_ready = &mut self.connections.get_mut(&addr).expect("Couldn't get the identity of disconnected player. I don't think i should panic but i don't care fuck you").identity.is_ready;
if *is_ready {
*is_ready = false;
self.state.ready_count -= 1;
info!(
"Currently {}/{} players are ready",
self.state.ready_count, self.settings.max_connections
);
}
self.connections.remove(&addr); self.connections.remove(&addr);
} }
} }