From 02a603ad1551c36b8f4ee2c99b54dae47adf6ea6 Mon Sep 17 00:00:00 2001 From: Rich Dunne Date: Mon, 14 Sep 2020 12:15:34 -0600 Subject: [PATCH] Removed unnecessary code and updated references. --- SceneManager/Menus/PathCreationMenu.cs | 2 +- SceneManager/Object Classes/Path.cs | 23 +++++++---------------- 2 files changed, 8 insertions(+), 17 deletions(-) diff --git a/SceneManager/Menus/PathCreationMenu.cs b/SceneManager/Menus/PathCreationMenu.cs index de748c8..7cf1bcd 100644 --- a/SceneManager/Menus/PathCreationMenu.cs +++ b/SceneManager/Menus/PathCreationMenu.cs @@ -149,7 +149,7 @@ namespace SceneManager Game.DisplayNotification($"~o~Scene Manager\n~g~[Success]~w~ Path {i + 1} complete."); currentPath.State = State.Finished; currentPath.IsEnabled = true; - currentPath.SetPathNumber(i + 1); + currentPath.Number = i + 1; // For each waypoint in the path's WaypointData, start a collector game fiber and loop while the path and waypoint exist, and while the path is enabled foreach (Waypoint waypoint in PathMainMenu.GetPaths()[i].Waypoints) diff --git a/SceneManager/Object Classes/Path.cs b/SceneManager/Object Classes/Path.cs index 6275acb..1a8e9b3 100644 --- a/SceneManager/Object Classes/Path.cs +++ b/SceneManager/Object Classes/Path.cs @@ -6,27 +6,18 @@ namespace SceneManager { public class Path { - private int _number { get; set; } - private bool _isEnabled { get; set; } - private State _state { get; set; } - - public int Number { get { return _number; } set { _number = value; } } - public bool IsEnabled { get { return _isEnabled; } set { _isEnabled = value; } } - public State State { get { return _state; } set { _state = value; } } + public int Number { get; set; } + public bool IsEnabled { get; set; } + public State State { get; set; } public List Waypoints = new List(); public Path(int pathNum, State pathState) { - _number = pathNum; - _state = pathState; + Number = pathNum; + State = pathState; DrawLinesBetweenWaypoints(); } - public void SetPathNumber(int pathNum) - { - _number = pathNum; - } - private void LowerWaypointBlipsOpacity() { foreach (Waypoint wp in Waypoints) @@ -56,7 +47,7 @@ namespace SceneManager public void DisablePath() { - _isEnabled = false; + IsEnabled = false; foreach(Waypoint wp in Waypoints) { wp.RemoveSpeedZone(); @@ -69,7 +60,7 @@ namespace SceneManager public void EnablePath() { - _isEnabled = true; + IsEnabled = true; foreach (Waypoint wp in Waypoints) { if (wp.IsCollector)