From 1247f46149cbb3a21590573fdcef23e920d0addc Mon Sep 17 00:00:00 2001 From: metamuffin Date: Thu, 13 Oct 2022 14:59:55 +0200 Subject: … MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client/Cargo.toml | 28 ++++++++++++++-------------- client/src/client/mod.rs | 2 ++ 2 files changed, 16 insertions(+), 14 deletions(-) (limited to 'client') diff --git a/client/Cargo.toml b/client/Cargo.toml index 5f14df4..1e58906 100644 --- a/client/Cargo.toml +++ b/client/Cargo.toml @@ -9,22 +9,22 @@ authors = [ license = "AGPL-3.0-only" [dependencies] -socket = { git = "https://github.com/heinrich5991/libtw2" } -datafile = { git = "https://github.com/heinrich5991/libtw2" } -map = { git = "https://github.com/heinrich5991/libtw2" } -net = { git = "https://github.com/heinrich5991/libtw2" } -common = { git = "https://github.com/heinrich5991/libtw2" } -event_loop = { git = "https://github.com/heinrich5991/libtw2" } -gamenet_teeworlds_0_5 = { git = "https://github.com/heinrich5991/libtw2", optional = true } -gamenet_teeworlds_0_6 = { git = "https://github.com/heinrich5991/libtw2", optional = true } -gamenet_teeworlds_0_7 = { git = "https://github.com/heinrich5991/libtw2", optional = true } -gamenet_ddnet = { git = "https://github.com/heinrich5991/libtw2", optional = true } -logger = { git = "https://github.com/heinrich5991/libtw2" } -packer = { git = "https://github.com/heinrich5991/libtw2" } -# snapshot = { git = "https://github.com/heinrich5991/libtw2" } +socket = { path = "../../libtw2/socket" } +datafile = { path = "../../libtw2/datafile" } +map = { path = "../../libtw2/map" } +net = { path = "../../libtw2/net" } +common = { path = "../../libtw2/common" } +event_loop = { path = "../../libtw2/event_loop" } +gamenet_teeworlds_0_5 = { path = "../../libtw2/gamenet/teeworlds-0.5", optional = true } +gamenet_teeworlds_0_6 = { path = "../../libtw2/gamenet/teeworlds-0.6", optional = true } +gamenet_teeworlds_0_7 = { path = "../../libtw2/gamenet/teeworlds-0.7", optional = true } +gamenet_ddnet = { path = "../../libtw2/gamenet/ddnet", optional = true } +logger = { path = "../../libtw2/logger" } +packer = { path = "../../libtw2/packer" } +# snapshot = { path = "../../libtw2/snapshot" } snapshot = { path = "../snapshot" } -ndarray = "0.9.1" +ndarray = "0.15.4" arrayvec = "0.5.2" clap = "2.31.2" hexdump = "0.1.1" diff --git a/client/src/client/mod.rs b/client/src/client/mod.rs index c779317..c5e7b9e 100644 --- a/client/src/client/mod.rs +++ b/client/src/client/mod.rs @@ -239,6 +239,8 @@ impl<'a, L: Loop> Application for Client { System::Snap(_) | System::SnapEmpty(_) | System::SnapSingle(_) => { self.num_snaps_since_reset += 1; { + let a = gamenet::msg::system::Snap; + let b = gamenet_ddnet::msg::system::Snap; let res = match *msg { System::Snap(s) => self.snaps.snap(&mut Log, obj_size, s), System::SnapEmpty(s) => self.snaps.snap_empty(&mut Log, obj_size, s), -- cgit v1.2.3-70-g09d2