diff --git a/SceneManager/Menus/PathMainMenu.cs b/SceneManager/Menus/PathMainMenu.cs index 2442b83..c7c43d2 100644 --- a/SceneManager/Menus/PathMainMenu.cs +++ b/SceneManager/Menus/PathMainMenu.cs @@ -13,8 +13,7 @@ namespace SceneManager FromPath = 0, FromWaypoint = 1, FromWorld = 2, - FromDirect = 3, - FromPlayer = 4 + FromPlayer = 3 } static class PathMainMenu diff --git a/SceneManager/Object Classes/CollectedVehicle.cs b/SceneManager/Object Classes/CollectedVehicle.cs index e95b946..7436958 100644 --- a/SceneManager/Object Classes/CollectedVehicle.cs +++ b/SceneManager/Object Classes/CollectedVehicle.cs @@ -3,7 +3,7 @@ using System.Linq; namespace SceneManager { - public class CollectedVehicle + internal class CollectedVehicle { internal Ped Driver { get; set; } internal Vehicle Vehicle { get; set; } @@ -14,7 +14,7 @@ namespace SceneManager internal bool Dismissed { get; set; } = false; internal bool Directed { get; set; } = false; internal bool SkipWaypoint { get; set; } = false; - internal bool ReadyForDirectTasks { get; set; } = false; + internal bool ReadyForDirectTasks { get; set; } = true; internal CollectedVehicle(Vehicle vehicle, Path path, Waypoint currentWaypoint) { @@ -83,16 +83,11 @@ namespace SceneManager DismissFromWaypoint(); } - if(dismissOption == DismissOption.FromPath) + if (dismissOption == DismissOption.FromPath) { DismissFromPath(); } - if(dismissOption == DismissOption.FromDirect) - { - DismissFromDirect(); - } - void DismissFromWorld() { Game.LogTrivial($"Dismissed {Vehicle.Model.Name} from the world"); @@ -176,31 +171,6 @@ namespace SceneManager }); } - - void DismissFromDirect() - { - Logger.Log($"Dismissing from direct."); - ReadyForDirectTasks = false; - GameFiber.StartNew(() => - { - var nearestCollectorWaypoint = Path.Waypoints.Where(wp => wp.IsCollector).OrderBy(wp => Vehicle.DistanceTo2D(wp.Position)).FirstOrDefault(); - if (nearestCollectorWaypoint != null) - { - // Enabling this will keep the menu, but the dismissed vehicle is immediately re - collected - while (nearestCollectorWaypoint != null && Vehicle && Driver && Vehicle.FrontPosition.DistanceTo2D(nearestCollectorWaypoint.Position) <= nearestCollectorWaypoint.CollectorRadius) - { - //Game.LogTrivial($"{Vehicle.Model.Name} is within 2x collector radius, cannot be fully dismissed yet."); - GameFiber.Yield(); - } - } - else - { - Logger.Log($"Nearest collector is null"); - } - - ReadyForDirectTasks = true; - }); - } } } }