From a052aefc8a9eb2ed54d3dc359a4752e93206b0f6 Mon Sep 17 00:00:00 2001 From: Rich Dunne Date: Tue, 25 Aug 2020 20:56:15 -0600 Subject: [PATCH] Removed unused Redirected property --- SceneManager/Menus/PathMainMenu.cs | 2 +- SceneManager/Object Classes/CollectedVehicle.cs | 12 ++---------- SceneManager/VehicleCollector.cs | 2 +- 3 files changed, 4 insertions(+), 12 deletions(-) diff --git a/SceneManager/Menus/PathMainMenu.cs b/SceneManager/Menus/PathMainMenu.cs index 9acd8e7..3ff1fd4 100644 --- a/SceneManager/Menus/PathMainMenu.cs +++ b/SceneManager/Menus/PathMainMenu.cs @@ -270,7 +270,7 @@ namespace SceneManager } else { - VehicleCollector.collectedVehicles.Add(nearbyVehicle.LicensePlate, new CollectedVehicle(nearbyVehicle, nearbyVehicle.LicensePlate, paths[directDriver.Index].Waypoints[0].Path, paths[directDriver.Index].Waypoints.Count, 1, false, false, true)); + VehicleCollector.collectedVehicles.Add(nearbyVehicle.LicensePlate, new CollectedVehicle(nearbyVehicle, nearbyVehicle.LicensePlate, paths[directDriver.Index].Waypoints[0].Path, paths[directDriver.Index].Waypoints.Count, 1, false, false)); Game.LogTrivial($"[Direct Driver] {nearbyVehicle.Model.Name} not in collection, adding to collection for path {paths[directDriver.Index].PathNum} with {paths[directDriver.Index].Waypoints.Count} waypoints"); if (directOptions.SelectedItem == "First waypoint") diff --git a/SceneManager/Object Classes/CollectedVehicle.cs b/SceneManager/Object Classes/CollectedVehicle.cs index c9892a8..acda8ec 100644 --- a/SceneManager/Object Classes/CollectedVehicle.cs +++ b/SceneManager/Object Classes/CollectedVehicle.cs @@ -12,9 +12,8 @@ namespace SceneManager public bool TasksAssigned { get; private set; } public bool DismissNow { get; private set; } public bool StoppedAtWaypoint { get; private set; } - public bool Redirected { get; private set; } - public CollectedVehicle(Vehicle vehicle, string licensePlate, int path, int totalWaypoints, int currentWaypoint, bool tasksAssigned, bool dismissNow, bool redirected) + public CollectedVehicle(Vehicle vehicle, string licensePlate, int path, int totalWaypoints, int currentWaypoint, bool tasksAssigned, bool dismissNow) { Vehicle = vehicle; LicensePlate = licensePlate; @@ -23,10 +22,9 @@ namespace SceneManager CurrentWaypoint = currentWaypoint; TasksAssigned = tasksAssigned; DismissNow = dismissNow; - Redirected = redirected; } - public void AssignPropertiesFromDirectedTask(int pathNum, int totalPathWaypoints, int currentWaypoint, bool tasksAssigned, bool dismiss, bool stoppedAtWaypoint)//, bool redirected) + public void AssignPropertiesFromDirectedTask(int pathNum, int totalPathWaypoints, int currentWaypoint, bool tasksAssigned, bool dismiss, bool stoppedAtWaypoint) { Path = pathNum; TotalWaypoints = totalPathWaypoints; @@ -34,7 +32,6 @@ namespace SceneManager TasksAssigned = tasksAssigned; DismissNow = dismiss; StoppedAtWaypoint = stoppedAtWaypoint; - //Redirected = redirected; } public void SetCurrentWaypoint(int currentWaypoint) @@ -56,10 +53,5 @@ namespace SceneManager { StoppedAtWaypoint = stoppedAtWaypoint; } - - public void SetRedirected(bool redirected) - { - Redirected = redirected; - } } } diff --git a/SceneManager/VehicleCollector.cs b/SceneManager/VehicleCollector.cs index e12ac83..abe077c 100644 --- a/SceneManager/VehicleCollector.cs +++ b/SceneManager/VehicleCollector.cs @@ -100,7 +100,7 @@ namespace SceneManager private static CollectedVehicle AddVehicleToCollection(Path path, Waypoint waypoint, Vehicle v) { - var collectedVehicle = new CollectedVehicle(v, v.LicensePlate, path.PathNum, path.Waypoints.Count, waypoint.Number, true, false, false); + var collectedVehicle = new CollectedVehicle(v, v.LicensePlate, path.PathNum, path.Waypoints.Count, waypoint.Number, true, false); collectedVehicles.Add(v.LicensePlate, collectedVehicle); Game.LogTrivial($"[WaypointVehicleCollector] Added {v.Model.Name} to collection from path {path.PathNum}, waypoint {waypoint.Number}."); return collectedVehicle;