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

Refactored Dismiss function to use local functions for each type of dismissal

Browse source
This commit is contained in:
Rich Dunne 2020-10-07 05:01:00 -06:00
parent f0a5fb6d80
commit 159f7d28a3
1 changed files with 41 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

56
SceneManager/Object Classes/CollectedVehicle.cs
View file

@ -39,17 +39,7 @@ namespace SceneManager
if (dismissOption == DismissOption.FromWorld) if (dismissOption == DismissOption.FromWorld)
{ {
Game.LogTrivial($"Dismissed {Vehicle.Model.Name} from the world"); DismissFromWorld();
while (Vehicle.HasOccupants)
{
foreach(Ped occupant in Vehicle.Occupants)
{
occupant.Dismiss();
occupant.Delete();
}
GameFiber.Yield();
}
Vehicle.Delete();
return; return;
} }
@ -60,13 +50,49 @@ namespace SceneManager
StoppedAtWaypoint = false; StoppedAtWaypoint = false;
} }
if(dismissOption == DismissOption.FromWaypoint && CurrentWaypoint.Number != Path.Waypoints.Count) if(dismissOption == DismissOption.FromWaypoint)
{ {
Logger.Log($"Dismissed from waypoint."); DismissFromWaypoint();
SkipWaypoint = true;
} }
if(dismissOption == DismissOption.FromWaypoint && CurrentWaypoint.Number == Path.Waypoints.Count || dismissOption == DismissOption.FromPath) if(dismissOption == DismissOption.FromPath)
{
DismissFromPath();
}
void DismissFromWorld()
{
Game.LogTrivial($"Dismissed {Vehicle.Model.Name} from the world");
while (Vehicle.HasOccupants)
{
foreach (Ped occupant in Vehicle.Occupants)
{
occupant.Dismiss();
occupant.Delete();
}
GameFiber.Yield();
}
Vehicle.Delete();
}
void DismissFromWaypoint()
{
if (CurrentWaypoint == null || Path == null)
{
Logger.Log($"CurrentWaypoint or Path are null");
}
else if (CurrentWaypoint?.Number != Path?.Waypoints.Count)
{
Logger.Log($"Dismissed from waypoint.");
SkipWaypoint = true;
}
else if (CurrentWaypoint?.Number == Path?.Waypoints.Count)
{
DismissFromPath();
}
}
void DismissFromPath()
{ {
Logger.Log($"Dismissing from path"); Logger.Log($"Dismissing from path");
Dismissed = true; Dismissed = true;