Skip to content

Commit e5139b3

Browse files
committed
Refactoring rpm comp callbacks from @andymac-2
1 parent e1fb4ec commit e5139b3

File tree

1 file changed

+4
-14
lines changed

1 file changed

+4
-14
lines changed

RasterPropMonitor/Core/RasterPropMonitor.cs

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -71,11 +71,9 @@ public class RasterPropMonitor : InternalModule
7171
[KSPField]
7272
public string resourceName = "SYSR_ELECTRICCHARGE";
7373
private bool resourceDepleted = false; // Managed by rpmComp callback
74-
private Action<bool> delResourceCallback;
7574
[KSPField]
7675
public bool needsCommConnection = false;
7776
private bool noCommConnection = false; // Managed by rpmComp callback
78-
private Action<float> delCommConnectionCallback;
7977
[KSPField]
8078
public string defaultFontTint = string.Empty;
8179
public Color defaultFontTintValue = Color.white;
@@ -273,14 +271,12 @@ public void Start()
273271

274272
if (needsElectricCharge)
275273
{
276-
delResourceCallback = (Action<bool>)Delegate.CreateDelegate(typeof(Action<bool>), this, "ResourceDepletedCallback");
277-
rpmComp.RegisterResourceCallback(resourceName, delResourceCallback);
274+
rpmComp.RegisterResourceCallback(resourceName, ResourceDepletedCallback);
278275
}
279276

280277
if (needsCommConnection)
281278
{
282-
delCommConnectionCallback = (Action<float>)Delegate.CreateDelegate(typeof(Action<float>), this, "CommConnectionCallback");
283-
rpmComp.RegisterVariableCallback("COMMNETVESSELCONTROLSTATE", delCommConnectionCallback);
279+
rpmComp.RegisterVariableCallback("COMMNETVESSELCONTROLSTATE", CommConnectionCallback);
284280
}
285281

286282
// And if the try block never completed, startupComplete will never be true.
@@ -314,14 +310,8 @@ public void OnDestroy()
314310
{
315311
Destroy(screenMat);
316312
}
317-
if (delResourceCallback != null)
318-
{
319-
rpmComp.UnregisterResourceCallback(resourceName, delResourceCallback);
320-
}
321-
if (delCommConnectionCallback != null)
322-
{
323-
rpmComp.UnregisterVariableCallback("COMMNETVESSELCONTROLSTATE", delCommConnectionCallback);
324-
}
313+
rpmComp.UnregisterResourceCallback(resourceName, ResourceDepletedCallback);
314+
rpmComp.UnregisterVariableCallback("COMMNETVESSELCONTROLSTATE", CommConnectionCallback);
325315
}
326316

327317
private static void PlayClickSound(FXGroup audioOutput)

0 commit comments

Comments
 (0)