teascade/skullball
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: teascade:8f45b16d1898d6baf32907a9c3ce34a3281e37ae
Branches Tags
teascade:main
..
compare: teascade:f3c203dd36eb1001deb8be50c89664206d042c19
Branches Tags
teascade:main

No commits in common. "8f45b16d1898d6baf32907a9c3ce34a3281e37ae" and "f3c203dd36eb1001deb8be50c89664206d042c19" have entirely different histories.
8f45b16d18 ... f3c203dd36

3 changed files with 6 additions and 12 deletions
Show Stats Expand all files Collapse all files

10
rust/src/game/mod.rs
View File

@ -482,11 +482,7 @@ impl Game {
}); });
} }
pub fn change_map_selection(&mut self, map_idx: u8, force: bool) { pub fn change_map_selection(&mut self, map_idx: u8, emit: bool) {
if self.selected_map_idx == map_idx && !force {
return;
}
godot_print!("change map");
self.selected_map_idx = map_idx; self.selected_map_idx = map_idx;
if let Some(map) = self.maps.get(map_idx as usize) { if let Some(map) = self.maps.get(map_idx as usize) {
self.selected_map = Some(map); self.selected_map = Some(map);
@ -505,7 +501,9 @@ impl Game {
} }
} }
}); });
self.run_deferred(move |s| s.signals().on_map_changed().emit(map_idx)); if emit {
self.run_deferred(move |s| s.signals().on_map_changed().emit(map_idx));
}
} }
} }

4
rust/src/net/protocol.rs
View File

@ -112,7 +112,7 @@ impl NetworkManager {
} }
Package::SelectMap(map_id) => { Package::SelectMap(map_id) => {
if let Some(game) = &mut Game::singleton() { if let Some(game) = &mut Game::singleton() {
game.bind_mut().change_map_selection(map_id, false); game.bind_mut().change_map_selection(map_id, true);
} }
} }
Package::GameStarted => { Package::GameStarted => {
@ -424,7 +424,7 @@ impl NetworkManager {
Package::SelectMap(map_idx) => { Package::SelectMap(map_idx) => {
if let Some(mut game) = Game::singleton() { if let Some(mut game) = Game::singleton() {
if game.bind().opts.is_true(GameOption::AllowAnyMap) { if game.bind().opts.is_true(GameOption::AllowAnyMap) {
game.bind_mut().change_map_selection(map_idx, false); game.bind_mut().change_map_selection(map_idx, true);
} }
} }
} }

4
rust/src/ui/lobby.rs
View File

@ -373,7 +373,6 @@ impl LobbyPanel {
} }
pub fn update_map_selection(&mut self, id: u8) { pub fn update_map_selection(&mut self, id: u8) {
godot_print!("update map selection");
if let Some(peer) = &mut NetworkManager::singleton().bind_mut().peer { if let Some(peer) = &mut NetworkManager::singleton().bind_mut().peer {
match peer { match peer {
PeerKind::Client(peer, addr) => { PeerKind::Client(peer, addr) => {
@ -384,9 +383,6 @@ impl LobbyPanel {
} }
} }
PeerKind::Server(peer, _) => { PeerKind::Server(peer, _) => {
if let Some(mut map_selection) = self.map_selection.clone() {
map_selection.select(self.find_idx(id));
}
if let Some(game) = &mut Game::singleton() { if let Some(game) = &mut Game::singleton() {
game.bind_mut().change_map_selection(id, false); game.bind_mut().change_map_selection(id, false);
} }