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

Move the minimap code from common to sandbox, reflecting where it's used. (Never in debug or edit mode)

Browse Source
This commit is contained in:
Dustin Carlino 2021-03-06 16:20:32 -08:00
parent d5d186dd37
commit 3f32c7abf3
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
game/src/common/mod.rs
View File

@ -9,13 +9,11 @@ use widgetry::{
ScreenPt, ScreenRectangle, Text, TextSpan, Toggle, VerticalAlignment, Widget, ScreenPt, ScreenRectangle, Text, TextSpan, Toggle, VerticalAlignment, Widget,
}; };
pub use self::minimap::MinimapController;
pub use self::warp::Warping; pub use self::warp::Warping;
use crate::app::App; use crate::app::App;
use crate::app::Transition; use crate::app::Transition;
use crate::info::{ContextualActions, InfoPanel, Tab}; use crate::info::{ContextualActions, InfoPanel, Tab};
mod minimap;
mod warp; mod warp;
// TODO This is now just used in two modes... // TODO This is now just used in two modes...

6
game/src/sandbox/gameplay/tutorial.rs
View File

@ -19,12 +19,12 @@ use widgetry::{
use crate::app::{App, Transition}; use crate::app::{App, Transition};
use crate::challenges::cutscene::CutsceneBuilder; use crate::challenges::cutscene::CutsceneBuilder;
use crate::common::{tool_panel, MinimapController, Warping}; use crate::common::{tool_panel, Warping};
use crate::edit::EditMode; use crate::edit::EditMode;
use crate::sandbox::gameplay::{GameplayMode, GameplayState}; use crate::sandbox::gameplay::{GameplayMode, GameplayState};
use crate::sandbox::{ use crate::sandbox::{
maybe_exit_sandbox, spawn_agents_around, Actions, AgentMeter, SandboxControls, SandboxMode, maybe_exit_sandbox, spawn_agents_around, Actions, AgentMeter, MinimapController,
SpeedControls, TimePanel, SandboxControls, SandboxMode, SpeedControls, TimePanel,
}; };
const ESCORT: CarID = CarID(0, VehicleType::Car); const ESCORT: CarID = CarID(0, VehicleType::Car);

0
game/src/common/minimap.rs → game/src/sandbox/minimap.rs
View File

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

@ -16,11 +16,12 @@ use widgetry::{
}; };
pub use self::gameplay::{spawn_agents_around, GameplayMode, TutorialPointer, TutorialState}; pub use self::gameplay::{spawn_agents_around, GameplayMode, TutorialPointer, TutorialState};
pub use self::minimap::MinimapController;
use self::misc_tools::{RoutePreview, TrafficRecorder}; use self::misc_tools::{RoutePreview, TrafficRecorder};
pub use self::speed::{SpeedControls, SpeedSetting, TimePanel}; pub use self::speed::{SpeedControls, SpeedSetting, TimePanel};
pub use self::time_warp::TimeWarpScreen; pub use self::time_warp::TimeWarpScreen;
use crate::app::{App, Transition}; use crate::app::{App, Transition};
use crate::common::{tool_panel, CommonState, MinimapController}; use crate::common::{tool_panel, CommonState};
use crate::debug::DebugMode; use crate::debug::DebugMode;
use crate::edit::{ use crate::edit::{
can_edit_lane, EditMode, LaneEditor, SaveEdits, StopSignEditor, TrafficSignalEditor, can_edit_lane, EditMode, LaneEditor, SaveEdits, StopSignEditor, TrafficSignalEditor,
@ -32,6 +33,7 @@ use crate::pregame::MainMenu;
pub mod dashboards; pub mod dashboards;
pub mod gameplay; pub mod gameplay;
mod minimap;
mod misc_tools; mod misc_tools;
mod speed; mod speed;
mod time_warp; mod time_warp;