thegeneralist01/Scene-Manager-DevRepo
1
Fork 0
mirror of https://github.com/thegeneralist01/Scene-Manager-DevRepo synced 2026-01-11 23:50:29 +01:00
Code Issues Activity

Added a check for if the driver loses their task and reassigns it.

Browse source
This commit is contained in:
Rich Dunne 2020-10-25 08:40:17 -06:00
parent 3e59e08b59
commit 667bea553d
1 changed files with 14 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

22
SceneManager/Object Classes/CollectedVehicle.cs
View file

@ -6,16 +6,16 @@ namespace SceneManager
{ {
internal class CollectedVehicle internal class CollectedVehicle
{ {
internal Ped Driver { get; set; } internal Ped Driver { get; private set; }
internal Vehicle Vehicle { get; set; } internal Vehicle Vehicle { get; private set; }
internal Path Path { get; set; } internal Path Path { get; private set; }
internal Waypoint CurrentWaypoint { get; set; } internal Waypoint CurrentWaypoint { get; private set; }
internal Waypoint NextWaypoint { get; private set; } internal Waypoint NextWaypoint { get; private set; }
internal bool StoppedAtWaypoint { get; set; } = false; internal bool StoppedAtWaypoint { get; private set; } = false;
internal bool Dismissed { get; set; } = false; internal bool Dismissed { get; private set; } = false;
internal bool Directed { get; set; } = false; internal bool Directed { get; set; } = false;
internal bool SkipWaypoint { get; set; } = false; internal bool SkipWaypoint { get; private set; } = false;
internal bool ReadyForDirectTasks { get; set; } = true; internal bool ReadyForDirectTasks { get; private set; } = true;
internal CollectedVehicle(Vehicle vehicle, Path path, Waypoint currentWaypoint) internal CollectedVehicle(Vehicle vehicle, Path path, Waypoint currentWaypoint)
{ {
@ -214,6 +214,12 @@ namespace SceneManager
oldPosition = Path.Waypoints[currentWaypointTask].Position; oldPosition = Path.Waypoints[currentWaypointTask].Position;
Driver.Tasks.DriveToPosition(Path.Waypoints[currentWaypointTask].Position, Path.Waypoints[currentWaypointTask].Speed, (VehicleDrivingFlags)Path.Waypoints[currentWaypointTask].DrivingFlagType, acceptedDistance); Driver.Tasks.DriveToPosition(Path.Waypoints[currentWaypointTask].Position, Path.Waypoints[currentWaypointTask].Speed, (VehicleDrivingFlags)Path.Waypoints[currentWaypointTask].DrivingFlagType, acceptedDistance);
} }
if(Driver.Tasks.CurrentTaskStatus == TaskStatus.NoTask)
{
//Game.DisplayNotification($"~o~Scene Manager ~r~[Error]\n{Vehicle.Model.Name} [{Vehicle.Handle}] driver [{Driver.Handle}] has no task. Reassiging current waypoint task.");
Game.LogTrivial($"{Vehicle.Model.Name} [{Vehicle.Handle}] driver [{Driver.Handle}] has no task. Reassiging current waypoint task.");
Driver.Tasks.DriveToPosition(Path.Waypoints[currentWaypointTask].Position, Path.Waypoints[currentWaypointTask].Speed, (VehicleDrivingFlags)Path.Waypoints[currentWaypointTask].DrivingFlagType, acceptedDistance);
}
GameFiber.Sleep(100); GameFiber.Sleep(100);
} }
} }