diff --git a/data/MANIFEST.txt b/data/MANIFEST.txt index ed99dd7df5..985cbe04fa 100644 --- a/data/MANIFEST.txt +++ b/data/MANIFEST.txt @@ -163,7 +163,9 @@ e348fda658d0fcb6bb8abdcec23d1dab data/system/assets/speed/speed_up.svg d15fe87c4174463e84b9a440162129ed data/system/assets/tools/undo.svg 841a6304950389f8ede9581d04c1021f data/system/assets/tools/visibility.svg 512477d8556de48901712165e905782f data/system/assets/tools/locate.svg +9fe22b344e21eb92b2eb824c5753fc33 data/system/assets/tools/next.svg e469148085a2046afd447d31a54d15ab data/system/assets/tools/search.svg +fe6ccbe746735c32d7b52257aeb5c4b9 data/system/assets/tools/prev.svg fe358c0fdf48b65117f7c4970fa35d91 data/system/assets/tools/settings.svg 1e0135f13d0aea11650460d6a61b5463 data/system/assets/tools/edit.svg cddd0aa7a98d4d511138befe8f56a6b7 data/system/assets/tools/delete.svg @@ -196,13 +198,13 @@ a5e849fa8883569519976ebfef3ae269 data/system/night_colors.json 517a360397bbb5a7573c2558e78fa4ea data/system/fonts/DejaVuSans.ttf e07df86cef2e721115583d61d1fb68a6 data/system/fonts/Roboto-Bold.ttf 11eabca2251325cfc5589c9c6fb57b46 data/system/fonts/Roboto-Regular.ttf -c828bba3efc56d0cec05687ad3876ecf data/system/maps/huge_seattle.bin -61be83c41ac8a76e2fa186e35b641930 data/system/maps/ballard.bin -6566e2454957e9176516098ffbf1df74 data/system/maps/downtown.bin -bb56cff1e30972e1c06047cd6ee5fb2d data/system/maps/caphill.bin -bdf60f12b14c6ba71696d75e5786dc15 data/system/maps/montlake.bin -223d5de2338994edfa7c031f28acf8ed data/system/maps/intl_district.bin -3ff346bcdf8b0eb47448fe1cc3b54bf3 data/system/maps/23rd.bin +9d576583a35841f56d35a18576d6fed9 data/system/maps/huge_seattle.bin +a63ed8ae6ec6e3757c467b9e0a6af814 data/system/maps/ballard.bin +a0b3e4522b9662ca542424dea276cfc3 data/system/maps/downtown.bin +293db774d8bd34a39f0125c7e42bc7a3 data/system/maps/caphill.bin +673cb315f9cd30cad5c069126e76e8ba data/system/maps/montlake.bin +4b2e27679a6facc6ef13d9d6a794b9b7 data/system/maps/intl_district.bin +4f61dbf6ef43917f10600595666e9284 data/system/maps/23rd.bin d71169fc1789707c403e70e6f2cc27d4 data/system/synthetic_maps/signal_double.json 407cf814c6b5c73b5e1857529b94a204 data/system/synthetic_maps/signal_single.json 7e3b93d87b5c6cf4788122e7f65ecac1 data/system/synthetic_maps/signal_fan_in.json diff --git a/game/src/main.rs b/game/src/main.rs index 374a1dfc04..d7126faf51 100644 --- a/game/src/main.rs +++ b/game/src/main.rs @@ -90,11 +90,5 @@ fn main() { args.done(); - // TODO Montlake map isn't loading, just start here - #[cfg(target_arch = "wasm32")] - { - flags.sim_flags.load = abstutil::path_synthetic_map("signal_single"); - } - ezgui::run(settings, |ctx| game::Game::new(flags, opts, mode, ctx)); } diff --git a/map_model/Cargo.toml b/map_model/Cargo.toml index 92e9b6ef52..6153108a58 100644 --- a/map_model/Cargo.toml +++ b/map_model/Cargo.toml @@ -7,7 +7,7 @@ edition = "2018" [dependencies] aabb-quadtree = "0.1.0" abstutil = { path = "../abstutil" } -fast_paths = { git = "https://github.com/easbar/fast_paths" } +fast_paths = { git = "https://github.com/dabreegster/fast_paths" } geom = { path = "../geom" } gtfs = { path = "../gtfs" } nbez = "0.1.0"