diff --git a/rustdoc/game/pregame/built_info/constant.BUILT_TIME_UTC.html b/rustdoc/game/pregame/built_info/constant.BUILT_TIME_UTC.html index e0e26d4ce3..75f3b52d35 100644 --- a/rustdoc/game/pregame/built_info/constant.BUILT_TIME_UTC.html +++ b/rustdoc/game/pregame/built_info/constant.BUILT_TIME_UTC.html @@ -1,2 +1,2 @@ -game::pregame::built_info::BUILT_TIME_UTC - Rust

[][src]Constant game::pregame::built_info::BUILT_TIME_UTC

pub const BUILT_TIME_UTC: &str = "Tue, 15 Sep 2020 20:42:48 +0000";

The built-time in RFC2822, UTC

+game::pregame::built_info::BUILT_TIME_UTC - Rust

[][src]Constant game::pregame::built_info::BUILT_TIME_UTC

pub const BUILT_TIME_UTC: &str = "Tue, 15 Sep 2020 21:03:06 +0000";

The built-time in RFC2822, UTC

\ No newline at end of file diff --git a/rustdoc/headless/fn.handle_command.html b/rustdoc/headless/fn.handle_command.html index 9613dcd403..947c7af3a2 100644 --- a/rustdoc/headless/fn.handle_command.html +++ b/rustdoc/headless/fn.handle_command.html @@ -1 +1 @@ -headless::handle_command - Rust

[][src]Function headless::handle_command

fn handle_command(
    path: &str,
    params: &HashMap<String, String>,
    body: &Vec<u8>,
    sim: &mut Sim,
    map: &mut Map
) -> Result<String, Box<dyn Error>>
\ No newline at end of file +headless::handle_command - Rust

[][src]Function headless::handle_command

fn handle_command(
    path: &str,
    params: &HashMap<String, String>,
    body: &Vec<u8>,
    sim: &mut Sim,
    map: &mut Map
) -> Result<String, Box<dyn Error>>
\ No newline at end of file diff --git a/rustdoc/headless/fn.serve_req.html b/rustdoc/headless/fn.serve_req.html index 00fc666802..50f3fe3937 100644 --- a/rustdoc/headless/fn.serve_req.html +++ b/rustdoc/headless/fn.serve_req.html @@ -1 +1 @@ -headless::serve_req - Rust

[][src]Function headless::serve_req

async fn serve_req(req: Request<Body>) -> Result<Response<Body>, Error>
\ No newline at end of file +headless::serve_req - Rust

[][src]Function headless::serve_req

async fn serve_req(req: Request<Body>) -> Result<Response<Body>, Error>
\ No newline at end of file diff --git a/rustdoc/src/game/home/runner/work/abstreet/abstreet/target/debug/build/game-3c7487281029702d/out/built.rs.html b/rustdoc/src/game/home/runner/work/abstreet/abstreet/target/debug/build/game-3c7487281029702d/out/built.rs.html index 465a16a43d..217bfeb1b3 100644 --- a/rustdoc/src/game/home/runner/work/abstreet/abstreet/target/debug/build/game-3c7487281029702d/out/built.rs.html +++ b/rustdoc/src/game/home/runner/work/abstreet/abstreet/target/debug/build/game-3c7487281029702d/out/built.rs.html @@ -111,7 +111,7 @@ /// The output of `rustdoc -V` pub const RUSTDOC_VERSION: &str = "rustdoc 1.46.0 (04488afe3 2020-08-24)"; /// The built-time in RFC2822, UTC -pub const BUILT_TIME_UTC: &str = "Tue, 15 Sep 2020 20:42:48 +0000"; +pub const BUILT_TIME_UTC: &str = "Tue, 15 Sep 2020 21:03:06 +0000"; /// The target architecture, given by `cfg!(target_arch)`. pub const CFG_TARGET_ARCH: &str = "x86_64"; /// The endianness, given by `cfg!(target_endian)`. diff --git a/rustdoc/src/headless/main.rs.html b/rustdoc/src/headless/main.rs.html index d9a279eece..c6e58b661a 100644 --- a/rustdoc/src/headless/main.rs.html +++ b/rustdoc/src/headless/main.rs.html @@ -303,8 +303,8 @@ }; use serde::Serialize; use sim::{ - AlertHandler, ExternalPerson, GetDrawAgents, PersonID, Scenario, Sim, SimFlags, SimOptions, - TripID, TripMode, VehicleType, + ExternalPerson, GetDrawAgents, PersonID, Scenario, Sim, SimFlags, SimOptions, TripID, TripMode, + VehicleType, }; use std::collections::{BTreeMap, HashMap}; use std::convert::TryFrom; @@ -320,12 +320,10 @@ #[tokio::main] async fn main() { let mut args = CmdArgs::new(); - let mut sim_flags = SimFlags::from_args(&mut args); + let sim_flags = SimFlags::from_args(&mut args); let port = args.required("--port").parse::<u16>().unwrap(); args.done(); - // Less spam - sim_flags.opts.alerts = AlertHandler::Silence; let (map, sim, _) = sim_flags.load(&mut Timer::new("setup headless")); *MAP.write().unwrap() = map; *SIM.write().unwrap() = sim; @@ -383,9 +381,11 @@ Ok(format!("sim reloaded")) } "/sim/load" => { - let mut flags: SimFlags = abstutil::from_json(body)?; - flags.opts.alerts = AlertHandler::Silence; - *FLAGS.write().unwrap() = flags; + let flags: SimFlags = abstutil::from_json(body)?; + // Only a few fields from SimFlags can be specified through the API. For the rest + // (namely SimOptions), keep the ones from the command line. + FLAGS.write().unwrap().load = flags.load; + FLAGS.write().unwrap().modifiers = flags.modifiers; // Also reset let (new_map, new_sim, _) = FLAGS.read().unwrap().load(&mut Timer::new("reset sim"));