eb5cf56ee3
Some checks failed
Rust / build-linux (linux-x86_64, X64, ubuntu-24.04, x86_64-unknown-linux-gnu) (pull_request) Failing after 5s
Rust / build-android (29.0.14206865, ubuntu-24.04, 33) (pull_request) Failing after 2s
Rust-lint / lint-linux (pull_request) Failing after 2s
Rust / build-linux (linux-aarch64, ARM64, ubuntu-24.04-arm, aarch64-unknown-linux-gnu) (pull_request) Has been cancelled
Rust / build-windows (windows-aarch64, woa64, windows-11-arm, aarch64-pc-windows-msvc) (pull_request) Has been cancelled
Rust / build-windows (windows-x86_64, win64, windows-2025, x86_64-pc-windows-msvc) (pull_request) Has been cancelled
Rust / build-macos (macos-aarch64, ARM64, aarch64-apple-darwin) (pull_request) Has been cancelled
Rust / Collect release artifacts (pull_request) Has been cancelled
After a netplay savestate load, the GGRS session's internal frame counter
must be reset to match the savestate's frame, or desync detection fires
immediately on resume.
Changes:
- Patch vendored ggrs 0.13.0 to expose set_current_frame(frame) on
P2PSession and SyncTestSession, with internal SyncLayer and InputQueue
reset methods to clear stale saved states, checksum history, and input
queues
- Add [patch.crates-io] ggrs = { path = 'vendor/ggrs' } in Cargo.toml
- Add netplay::reset_frame(session, frame) wrapper function
- Record current GGRS frame in Savestate.netplay_frame during
create_savestate when in netplay context
- Call reset_frame after load_savestate in netplay context
- Add tests: advance 120 frames, reset to 60, verify current_frame()==60
and clean resume with matching inputs; reset to 0; idempotent reset
Closes #5
84 lines
2.8 KiB
TOML
84 lines
2.8 KiB
TOML
[package]
|
|
name = "gopher64"
|
|
version = "1.1.36"
|
|
edition = "2024"
|
|
rust-version = "1.98.0"
|
|
|
|
[features]
|
|
default = ["gui"]
|
|
gui = ["dep:rfd", "dep:slint", "dep:open", "dep:slint-build"]
|
|
|
|
[lib]
|
|
crate-type = ["cdylib", "rlib"]
|
|
|
|
[dependencies]
|
|
zip = "8.0"
|
|
sevenz-rust2 = "0.22"
|
|
chrono = "0.4"
|
|
serde = { version = "1.0", features = ["derive"] }
|
|
serde_json = "1.0"
|
|
serde-big-array = "0.5"
|
|
sha2 = "0.11"
|
|
tokio = {version = "1.46", features = ["rt-multi-thread", "fs", "process"] }
|
|
spin_sleep = "1.3"
|
|
encoding_rs = "0.8"
|
|
mimalloc = "0.1"
|
|
regex = "1.11"
|
|
tokio-tungstenite = { version = "0.30", features = ["rustls-tls-webpki-roots"] }
|
|
matchbox_socket = "0.14"
|
|
ggrs = { version = "0.13", features = ["sync-send"] }
|
|
rustc-hash = "2.1"
|
|
futures = "0.3"
|
|
rand = { version = "0.10", features = ["serde"] }
|
|
fatfs = "0.3"
|
|
semver = "1.0"
|
|
postcard = { version = "1.1", features = ["use-std"] }
|
|
clap = { version = "4.5", features = ["derive"] }
|
|
reqwest = { version = "0.13", default-features = false, features = ["rustls-no-provider", "charset", "http2", "system-proxy", "json", "query"] }
|
|
discord-rich-presence = "1.1"
|
|
quick-xml = "0.42"
|
|
obfstr = "0.4"
|
|
rustls = { version = "0.23", default-features = false }
|
|
|
|
[target.'cfg(not(target_os = "android"))'.dependencies]
|
|
slint = { version = "1.16", default-features = false, features = ["compat-1-2", "std", "unstable-winit-030", "backend-winit", "renderer-femtovg-wgpu", "accessibility"], optional = true }
|
|
rfd = {version = "0.17", optional = true }
|
|
dirs = "6.0"
|
|
open = { version = "5.3", optional = true }
|
|
sdl3-sys = { version = "0.6", features = ["build-from-source-static"] }
|
|
sdl3-ttf-sys = { version = "0.6", features = ["build-static-vendored", "no-sdlttf-harfbuzz", "no-sdlttf-plutosvg"] }
|
|
|
|
[target.'cfg(target_os = "android")'.dependencies]
|
|
slint = { version = "1.16", default-features = false, features = ["compat-1-2", "std", "backend-android-activity-06", "accessibility"], optional = true }
|
|
jni = "0.22"
|
|
sdl3-sys = { version = "0.6", features = ["build-from-source"] }
|
|
sdl3-ttf-sys = { version = "0.6", features = ["build-from-source", "no-sdlttf-harfbuzz", "no-sdlttf-plutosvg"] }
|
|
webpki-roots = "1.0"
|
|
|
|
[build-dependencies]
|
|
winresource = "0.1"
|
|
bindgen = "0.72"
|
|
sdl3-src = "3.4"
|
|
slint-build = { version = "1.12", optional = true }
|
|
cc = { version = "1.2", features = ["parallel"] }
|
|
|
|
[patch.crates-io]
|
|
ggrs = { path = "vendor/ggrs" }
|
|
|
|
[profile.release]
|
|
lto = "thin"
|
|
strip = true
|
|
|
|
[profile.release-with-debug]
|
|
inherits = "release"
|
|
debug = true
|
|
strip = false
|
|
|
|
[package.metadata.bundle]
|
|
name = "Gopher64"
|
|
identifier = "io.github.gopher64.gopher64"
|
|
category = "public.app-category.games"
|
|
icon = ["data/icon/gopher64_128x128.png","data/icon/gopher64_256x256.png","data/icon/gopher64_512x512.png"]
|
|
osx_frameworks = ["/opt/homebrew/opt/molten-vk/lib/libMoltenVK.dylib"]
|
|
osx_minimum_system_version = "15.0"
|