aboutsummaryrefslogtreecommitdiff
path: root/pixel-client/src/game.rs
diff options
context:
space:
mode:
Diffstat (limited to 'pixel-client/src/game.rs')
-rw-r--r--pixel-client/src/game.rs11
1 files changed, 11 insertions, 0 deletions
diff --git a/pixel-client/src/game.rs b/pixel-client/src/game.rs
index 13ed1709..cc1645d9 100644
--- a/pixel-client/src/game.rs
+++ b/pixel-client/src/game.rs
@@ -155,6 +155,7 @@ impl Game {
let movement_packet = player
.movement
.update(&self.collision_map, direction, boost, dt);
+
if send_movement {
self.network.queue_out.push_back(movement_packet);
}
@@ -167,6 +168,16 @@ impl Game {
self.camera_center.exp_to(player.movement.position, dt * 5.);
}
+ for p1 in &self.player_ids {
+ for p2 in &self.player_ids {
+ if p1 != p2 {
+ if let Some([p1, p2]) = self.players.get_many_mut([p1, p2]) {
+ p1.movement.collide(&mut p2.movement, dt);
+ }
+ }
+ }
+ }
+
for player in self.players.values_mut() {
if let Some(item) = &mut player.item {
item.parent_position = player.movement.position;