diff options
| author | metamuffin <metamuffin@disroot.org> | 2024-07-08 17:19:25 +0200 |
|---|---|---|
| committer | metamuffin <metamuffin@disroot.org> | 2024-07-08 17:19:25 +0200 |
| commit | 90f42ec7a3f28fb3a87c233a81e8f65de832983e (patch) | |
| tree | dba1334af5bb711555add7159874d1eabd89a4db /server/src/customer | |
| parent | 70bb8744cd742dc6c8a71ab174e4a1b058c7bec8 (diff) | |
| download | hurrycurry-90f42ec7a3f28fb3a87c233a81e8f65de832983e.tar hurrycurry-90f42ec7a3f28fb3a87c233a81e8f65de832983e.tar.bz2 hurrycurry-90f42ec7a3f28fb3a87c233a81e8f65de832983e.tar.zst | |
move glam dep to protocol crate
Diffstat (limited to 'server/src/customer')
| -rw-r--r-- | server/src/customer/mod.rs | 3 | ||||
| -rw-r--r-- | server/src/customer/movement.rs | 3 | ||||
| -rw-r--r-- | server/src/customer/pathfinding.rs | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/server/src/customer/mod.rs b/server/src/customer/mod.rs index c11a1aec..10788206 100644 --- a/server/src/customer/mod.rs +++ b/server/src/customer/mod.rs @@ -21,8 +21,7 @@ mod pathfinding; use crate::{data::Gamedata, game::Tile}; use anyhow::{anyhow, Result}; use fake::{faker, Fake}; -use glam::IVec2; -use hurrycurry_protocol::{DemandIndex, Message, PacketS, PlayerID}; +use hurrycurry_protocol::{glam::IVec2, DemandIndex, Message, PacketS, PlayerID}; use log::debug; use movement::MovementBase; use pathfinding::{find_path, Path}; diff --git a/server/src/customer/movement.rs b/server/src/customer/movement.rs index 4da76de7..34ed5b16 100644 --- a/server/src/customer/movement.rs +++ b/server/src/customer/movement.rs @@ -16,8 +16,7 @@ along with this program. If not, see <https://www.gnu.org/licenses/>. */ -use glam::{IVec2, Vec2}; -use hurrycurry_protocol::PacketS; +use hurrycurry_protocol::{glam::{IVec2, Vec2}, PacketS}; use std::collections::HashSet; const PLAYER_SIZE: f32 = 0.4; diff --git a/server/src/customer/pathfinding.rs b/server/src/customer/pathfinding.rs index a2623e5c..29ee4e00 100644 --- a/server/src/customer/pathfinding.rs +++ b/server/src/customer/pathfinding.rs @@ -16,8 +16,10 @@ */ use super::movement::MovementBase; -use glam::{IVec2, Vec2}; -use hurrycurry_protocol::PacketS; +use hurrycurry_protocol::{ + glam::{IVec2, Vec2}, + PacketS, +}; use log::debug; use std::{ cmp::Ordering, |