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

Clean up some of the trips state when abruptly deleting agents. #312

Browse Source
This commit is contained in:
Dustin Carlino 2020-10-21 12:32:14 -07:00
parent d98c5bc6bc
commit adcd0f65fe
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sim/src/sim/mod.rs
View File

@ -912,6 +912,7 @@ impl Sim {
Some(vehicle),
&mut ctx,
);
self.trips.trip_abruptly_cancelled(trip, AgentID::Car(car));
}
AgentID::Pedestrian(ped) => {
self.walking.delete_ped(ped, &mut ctx);
@ -922,6 +923,8 @@ impl Sim {
None,
&mut ctx,
);
self.trips
.trip_abruptly_cancelled(trip, AgentID::Pedestrian(ped));
}
AgentID::BusPassenger(_, _) => unreachable!(),
}

4
sim/src/trips.rs
View File

@ -823,6 +823,10 @@ impl TripManager {
self.person_finished_trip(now, person, ctx);
}
pub fn trip_abruptly_cancelled(&mut self, trip: TripID, agent: AgentID) {
assert_eq!(self.active_trip_mode.remove(&agent), Some(trip));
}
pub fn active_agents(&self) -> Vec<AgentID> {
self.active_trip_mode.keys().cloned().collect()
}