suppress minimap in tutorials

This commit is contained in:
Dustin Carlino 2019-12-09 13:23:18 -08:00
parent 3187fc7ef8
commit 158f09c3a9
2 changed files with 20 additions and 5 deletions

View File

@ -129,6 +129,13 @@ impl GameplayMode {
} }
true true
} }
pub fn has_minimap(&self) -> bool {
match self {
GameplayMode::FixTrafficSignalsTutorial(_) => false,
_ => true,
}
}
} }
impl GameplayRunner { impl GameplayRunner {

View File

@ -33,7 +33,7 @@ pub struct SandboxMode {
overlay: Overlays, overlay: Overlays,
gameplay: gameplay::GameplayRunner, gameplay: gameplay::GameplayRunner,
common: CommonState, common: CommonState,
minimap: Minimap, minimap: Option<Minimap>,
menu: ModalMenu, menu: ModalMenu,
} }
@ -67,9 +67,13 @@ impl SandboxMode {
), ),
agent_tools: AgentTools::new(), agent_tools: AgentTools::new(),
overlay: Overlays::Inactive, overlay: Overlays::Inactive,
gameplay: gameplay::GameplayRunner::initialize(mode, ui, ctx),
common: CommonState::new(ctx), common: CommonState::new(ctx),
minimap: Minimap::new(), minimap: if mode.has_minimap() {
Some(Minimap::new())
} else {
None
},
gameplay: gameplay::GameplayRunner::initialize(mode, ui, ctx),
menu: ModalMenu::new( menu: ModalMenu::new(
"Sandbox Mode", "Sandbox Mode",
vec![(lctrl(Key::E), "edit mode"), (hotkey(Key::X), "reset sim")], vec![(lctrl(Key::E), "edit mode"), (hotkey(Key::X), "reset sim")],
@ -131,7 +135,9 @@ impl State for SandboxMode {
{ {
return t; return t;
} }
self.minimap.event(ui, ctx); if let Some(ref mut m) = self.minimap {
m.event(ui, ctx);
}
if let Some(t) = self if let Some(t) = self
.agent_tools .agent_tools
@ -305,7 +311,9 @@ impl State for SandboxMode {
self.info_tools.draw(g); self.info_tools.draw(g);
self.general_tools.draw(g); self.general_tools.draw(g);
self.gameplay.draw(g, ui); self.gameplay.draw(g, ui);
self.minimap.draw(g, ui); if let Some(ref m) = self.minimap {
m.draw(g, ui);
}
} }
fn on_suspend(&mut self, _: &mut EventCtx, _: &mut UI) { fn on_suspend(&mut self, _: &mut EventCtx, _: &mut UI) {