a-b-street/abstreet
1
1
Fork 0
mirror of https://github.com/a-b-street/abstreet.git synced 2024-11-29 12:43:38 +03:00
Code Issues Projects Releases Wiki Activity

reset edits when leaving sandbox mode

Browse Source
This commit is contained in:
Dustin Carlino 2019-11-19 11:47:40 -08:00
parent c0fea0811f
commit c7fbaaf7e1
2 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
game/src/sandbox/mod.rs
View File

@ -5,16 +5,19 @@ mod score;
use crate::common::{time_controls, AgentTools, CommonState, SpeedControls};
use crate::debug::DebugMode;
use crate::edit::apply_map_edits;
use crate::edit::EditMode;
use crate::game::{msg, State, Transition, WizardState};
use crate::helpers::ID;
use crate::ui::{ShowEverything, UI};
use abstutil::Timer;
use ezgui::{
hotkey, layout, lctrl, Choice, EventCtx, EventLoopMode, GfxCtx, Key, Line, MenuUnderButton,
ModalMenu, Text, Wizard,
};
pub use gameplay::GameplayMode;
use geom::Duration;
use map_model::MapEdits;
use sim::Sim;
pub struct SandboxMode {
@ -163,13 +166,29 @@ impl State for SandboxMode {
choices
},
)?;
let map_name = ui.primary.map.get_name().to_string();
match resp.as_str() {
"save edits and quit" => {
ui.primary.map.save_edits();
// Always reset edits if we just saved edits.
apply_map_edits(&mut ui.primary, &ui.cs, ctx, MapEdits::new(map_name));
ui.primary.map.mark_edits_fresh();
ui.primary
.map
.recalculate_pathfinding_after_edits(&mut Timer::new("reset edits"));
ui.primary.clear_sim();
Some(Transition::PopTwice)
}
"quit challenge" => {
if !ui.primary.map.get_edits().is_empty() {
apply_map_edits(&mut ui.primary, &ui.cs, ctx, MapEdits::new(map_name));
ui.primary.map.mark_edits_fresh();
ui.primary
.map
.recalculate_pathfinding_after_edits(&mut Timer::new(
"reset edits",
));
}
ui.primary.clear_sim();
Some(Transition::PopTwice)
}

4
map_model/src/edits.rs
View File

@ -65,6 +65,10 @@ impl MapEdits {
}
}
pub fn is_empty(&self) -> bool {
self.edits_name == "no_edits" && self.commands.is_empty()
}
pub fn load(map_name: &str, edits_name: &str, timer: &mut Timer) -> MapEdits {
if edits_name == "no_edits" {
return MapEdits::new(map_name.to_string());