a-b-street/abstreet
1
1
Fork 0
mirror of https://github.com/a-b-street/abstreet.git synced 2025-01-05 13:05:06 +03:00
Code Issues Projects Releases Wiki Activity

preserve scenario when changing maps

Browse Source
This commit is contained in:
Dustin Carlino 2020-01-14 14:05:21 -08:00
parent f613b003a4
commit 875f311f55
2 changed files with 31 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
game/src/sandbox/gameplay/freeform.rs
View File

@ -1,9 +1,10 @@
use crate::edit::EditMode;
use crate::game::{msg, Transition, WizardState};
use crate::game::{msg, State, Transition, WizardState};
use crate::helpers::ID;
use crate::managed::Composite;
use crate::sandbox::gameplay::{change_scenario, load_map, spawner, GameplayMode, GameplayState};
use crate::sandbox::gameplay::{change_scenario, spawner, GameplayMode, GameplayState};
use crate::sandbox::overlays::Overlays;
use crate::sandbox::SandboxMode;
use crate::ui::UI;
use ezgui::{
hotkey, lctrl, Color, EventCtx, GfxCtx, HorizontalAlignment, Key, Line, ManagedWidget,
@ -110,10 +111,10 @@ pub fn freeform_controller(
.aligned(HorizontalAlignment::Center, VerticalAlignment::Top)
.build(ctx),
)
.cb(
"change map",
Box::new(|_, _| Some(Transition::Push(WizardState::new(Box::new(load_map))))),
)
.cb("change map", {
let gameplay = gameplay.clone();
Box::new(move |_, _| Some(Transition::Push(make_load_map(gameplay.clone()))))
})
.cb(
"change scenario",
Box::new(|_, _| {
@ -133,3 +134,27 @@ pub fn freeform_controller(
}),
)
}
fn make_load_map(gameplay: GameplayMode) -> Box<dyn State> {
WizardState::new(Box::new(move |wiz, ctx, ui| {
if let Some(name) = wiz.wrap(ctx).choose_string("Load which map?", || {
let current_map = ui.primary.map.get_name();
abstutil::list_all_objects(abstutil::path_all_maps())
.into_iter()
.filter(|n| n != current_map)
.collect()
}) {
ui.switch_map(ctx, abstutil::path_map(&name));
// Assume a scenario with the same name exists.
Some(Transition::PopThenReplace(Box::new(SandboxMode::new(
ctx,
ui,
gameplay.clone(),
))))
} else if wiz.aborted() {
Some(Transition::Pop)
} else {
None
}
}))
}

22
game/src/sandbox/gameplay/mod.rs
View File

@ -234,28 +234,6 @@ fn change_scenario(wiz: &mut Wizard, ctx: &mut EventCtx, ui: &mut UI) -> Option<
))))
}
fn load_map(wiz: &mut Wizard, ctx: &mut EventCtx, ui: &mut UI) -> Option<Transition> {
if let Some(name) = wiz.wrap(ctx).choose_string("Load which map?", || {
let current_map = ui.primary.map.get_name();
abstutil::list_all_objects(abstutil::path_all_maps())
.into_iter()
.filter(|n| n != current_map)
.collect()
}) {
ui.switch_map(ctx, abstutil::path_map(&name));
Some(Transition::PopThenReplace(Box::new(SandboxMode::new(
ctx,
ui,
// TODO If we were playing a scenario, load that one...
GameplayMode::Freeform,
))))
} else if wiz.aborted() {
Some(Transition::Pop)
} else {
None
}
}
// Must call menu.event first. Returns true if the caller should set the overlay to the custom
// thing.
fn manage_overlays(