Skip to content

Commit 17db11a

Browse files
committed
refactor fineprint reflection a bit
1 parent de9b925 commit 17db11a

File tree

3 files changed

+14
-8
lines changed

3 files changed

+14
-8
lines changed

SCANsat/SCAN_Data/SCANwaypoint.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ public bool LandingTarget
140140

141141
private Waypoint reflectWaypoint(StationaryPointParameter p)
142142
{
143-
if (SCANmainMenuLoader.FinePrintStationaryWaypoint)
143+
if (SCANfinePrint.FinePrintStationaryWaypoint)
144144
{
145145
return SCANfinePrint.FinePrintStationaryWaypointObject(p);
146146
}
@@ -150,7 +150,7 @@ private Waypoint reflectWaypoint(StationaryPointParameter p)
150150

151151
private FlightBand reflectFlightBand(SurveyWaypointParameter p)
152152
{
153-
if (SCANmainMenuLoader.FinePrintFlightBand)
153+
if (SCANfinePrint.FinePrintFlightBand)
154154
{
155155
return SCANfinePrint.FinePrintFlightBandValue(p);
156156
}

SCANsat/SCAN_Reflection/SCANfinePrint.cs

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@ namespace SCANsat.SCAN_Reflection
99
{
1010
static class SCANfinePrint
1111
{
12+
internal static bool FinePrintFlightBand = false;
13+
internal static bool FinePrintStationaryWaypoint = false;
14+
1215
private static bool FinePrintFlightBandRun = false;
1316
private static bool FinePrintStationaryWaypointRun = false;
1417

@@ -31,6 +34,12 @@ internal static Waypoint FinePrintStationaryWaypointObject(StationaryPointParame
3134
return w;
3235
}
3336

37+
internal static void Initialize()
38+
{
39+
FinePrintStationaryWaypoint = FinePrintStationaryWaypointReflection();
40+
FinePrintFlightBand = FinePrintFlightBandReflection();
41+
}
42+
3443
internal static FlightBand FinePrintFlightBandValue(SurveyWaypointParameter p)
3544
{
3645
FlightBand b = FlightBand.NONE;
@@ -46,7 +55,7 @@ internal static FlightBand FinePrintFlightBandValue(SurveyWaypointParameter p)
4655
return b;
4756
}
4857

49-
internal static bool FinePrintStationaryWaypointReflection()
58+
private static bool FinePrintStationaryWaypointReflection()
5059
{
5160
if (_FinePrintStationaryWaypoint != null)
5261
{
@@ -86,7 +95,7 @@ internal static bool FinePrintStationaryWaypointReflection()
8695
return false;
8796
}
8897

89-
internal static bool FinePrintFlightBandReflection()
98+
private static bool FinePrintFlightBandReflection()
9099
{
91100
if (_FinePrintFlightBand != null)
92101
{

SCANsat/SCANmainMenuLoader.cs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@ public class SCANmainMenuLoader : MonoBehaviour
2828
private string[] Assemblies = new string[9] { "SCANsatKethane", "RasterPropMonitor", "MechJeb2", "ContractConfigurator", "CC_SCANsat", "SCANmechjeb", "ModuleManager", "Kopernicus", "Kopernicus.OnDemand" };
2929

3030
internal static string SCANsatVersion = "";
31-
internal static bool FinePrintFlightBand = false;
32-
internal static bool FinePrintStationaryWaypoint = false;
3331
public static bool MechJebLoaded = false;
3432
public static bool MMLoaded = false;
3533
public static bool KopernicusLoaded = false;
@@ -63,8 +61,7 @@ private void Start()
6361
}
6462

6563
findAssemblies(Assemblies);
66-
FinePrintStationaryWaypoint = SCANfinePrint.FinePrintStationaryWaypointReflection();
67-
FinePrintFlightBand = SCANfinePrint.FinePrintFlightBandReflection();
64+
SCANfinePrint.Initialize();
6865
SCANconfigLoader.configLoader();
6966
}
7067

0 commit comments

Comments
 (0)