diff --git a/Coroutine/ActiveCoroutine.cs b/Coroutine/ActiveCoroutine.cs
index dd0ec8e..4b2456f 100644
--- a/Coroutine/ActiveCoroutine.cs
+++ b/Coroutine/ActiveCoroutine.cs
@@ -84,7 +84,7 @@ namespace Coroutine {
}
internal bool OnEvent(Event evt) {
- if (!this.WasCanceled && Equals(this.current.Event, evt))
+ if (!this.WasCanceled && object.Equals(this.current.Event, evt))
this.MoveNext();
return this.IsFinished;
}
diff --git a/Coroutine/CoroutineHandler.cs b/Coroutine/CoroutineHandler.cs
index 2e1d6b6..2575d2a 100644
--- a/Coroutine/CoroutineHandler.cs
+++ b/Coroutine/CoroutineHandler.cs
@@ -11,42 +11,42 @@ namespace Coroutine {
private static readonly CoroutineHandlerInstance Instance = new CoroutineHandlerInstance();
///
- public static int TickingCount => Instance.TickingCount;
+ public static int TickingCount => CoroutineHandler.Instance.TickingCount;
///
- public static int EventCount => Instance.EventCount;
+ public static int EventCount => CoroutineHandler.Instance.EventCount;
///
public static ActiveCoroutine Start(IEnumerable coroutine, string name = "", int priority = 0) {
- return Instance.Start(coroutine, name, priority);
+ return CoroutineHandler.Instance.Start(coroutine, name, priority);
}
///
public static ActiveCoroutine Start(IEnumerator coroutine, string name = "", int priority = 0) {
- return Instance.Start(coroutine, name, priority);
+ return CoroutineHandler.Instance.Start(coroutine, name, priority);
}
///
public static ActiveCoroutine InvokeLater(Wait wait, Action action, string name = "", int priority = 0) {
- return Instance.InvokeLater(wait, action, name, priority);
+ return CoroutineHandler.Instance.InvokeLater(wait, action, name, priority);
}
///
public static void Tick(double deltaSeconds) {
- Instance.Tick(deltaSeconds);
+ CoroutineHandler.Instance.Tick(deltaSeconds);
}
///
public static void Tick(TimeSpan delta) {
- Instance.Tick(delta);
+ CoroutineHandler.Instance.Tick(delta);
}
///
public static void RaiseEvent(Event evt) {
- Instance.RaiseEvent(evt);
+ CoroutineHandler.Instance.RaiseEvent(evt);
}
///
public static IEnumerable GetActiveCoroutines() {
- return Instance.GetActiveCoroutines();
+ return CoroutineHandler.Instance.GetActiveCoroutines();
}
}
diff --git a/Coroutine/CoroutineHandlerInstance.cs b/Coroutine/CoroutineHandlerInstance.cs
index ba15111..4046b1d 100644
--- a/Coroutine/CoroutineHandlerInstance.cs
+++ b/Coroutine/CoroutineHandlerInstance.cs
@@ -75,7 +75,7 @@ namespace Coroutine {
/// The that the underlying coroutine should have. The higher the priority, the earlier it is advanced compared to other coroutines that advance around the same time. Defaults to 0.
/// An active coroutine object representing this coroutine
public ActiveCoroutine InvokeLater(Wait wait, Action action, string name = "", int priority = 0) {
- return this.Start(InvokeLaterImpl(wait, action), name, priority);
+ return this.Start(CoroutineHandlerInstance.InvokeLaterImpl(wait, action), name, priority);
}
///
diff --git a/Example/Example.cs b/Example/Example.cs
index 543817e..ca7342e 100644
--- a/Example/Example.cs
+++ b/Example/Example.cs
@@ -9,19 +9,19 @@ namespace Example {
private static readonly Event TestEvent = new Event();
public static void Main() {
- var seconds = CoroutineHandler.Start(WaitSeconds(), "Awesome Waiting Coroutine");
- CoroutineHandler.Start(PrintEvery10Seconds(seconds));
+ var seconds = CoroutineHandler.Start(Example.WaitSeconds(), "Awesome Waiting Coroutine");
+ CoroutineHandler.Start(Example.PrintEvery10Seconds(seconds));
- CoroutineHandler.Start(EmptyCoroutine());
+ CoroutineHandler.Start(Example.EmptyCoroutine());
CoroutineHandler.InvokeLater(new Wait(5), () => {
Console.WriteLine("Raising test event");
- CoroutineHandler.RaiseEvent(TestEvent);
+ CoroutineHandler.RaiseEvent(Example.TestEvent);
});
- CoroutineHandler.InvokeLater(new Wait(TestEvent), () => Console.WriteLine("Example event received"));
+ CoroutineHandler.InvokeLater(new Wait(Example.TestEvent), () => Console.WriteLine("Example event received"));
- CoroutineHandler.InvokeLater(new Wait(TestEvent), () => Console.WriteLine("I am invoked after 'Example event received'"), priority: -5);
- CoroutineHandler.InvokeLater(new Wait(TestEvent), () => Console.WriteLine("I am invoked before 'Example event received'"), priority: 2);
+ CoroutineHandler.InvokeLater(new Wait(Example.TestEvent), () => Console.WriteLine("I am invoked after 'Example event received'"), priority: -5);
+ CoroutineHandler.InvokeLater(new Wait(Example.TestEvent), () => Console.WriteLine("I am invoked before 'Example event received'"), priority: 2);
var lastTime = DateTime.Now;
while (true) {
@@ -38,7 +38,7 @@ namespace Example {
Console.WriteLine("After 1 second " + DateTime.Now);
yield return new Wait(9);
Console.WriteLine("After 10 seconds " + DateTime.Now);
- CoroutineHandler.Start(NestedCoroutine());
+ CoroutineHandler.Start(Example.NestedCoroutine());
yield return new Wait(5);
Console.WriteLine("After 5 more seconds " + DateTime.Now);
yield return new Wait(10);
diff --git a/Tests/EventBasedCoroutineTests.cs b/Tests/EventBasedCoroutineTests.cs
index 5730d96..20bbd64 100644
--- a/Tests/EventBasedCoroutineTests.cs
+++ b/Tests/EventBasedCoroutineTests.cs
@@ -128,7 +128,7 @@ namespace Tests {
var p = CoroutineHandler.Start(Parent());
CoroutineHandler.RaiseEvent(onParentCreated);
// Nested corotuine starting in OnFinished.
- p.OnFinished += ac => {
+ p.OnFinished += _ => {
CoroutineHandler.Start(Child());
CoroutineHandler.RaiseEvent(onChildCreated);
};
diff --git a/Tests/TimeBasedCoroutineTests.cs b/Tests/TimeBasedCoroutineTests.cs
index 2e0fa46..20f873c 100644
--- a/Tests/TimeBasedCoroutineTests.cs
+++ b/Tests/TimeBasedCoroutineTests.cs
@@ -164,7 +164,7 @@ namespace Tests {
// Nested corotuine starting.
var p = CoroutineHandler.Start(Parent());
// Nested corotuine starting in OnFinished.
- p.OnFinished += ac => CoroutineHandler.Start(Child());
+ p.OnFinished += _ => CoroutineHandler.Start(Child());
}
var always = CoroutineHandler.Start(AlwaysRunning());
@@ -408,7 +408,7 @@ namespace Tests {
var p = CoroutineHandler.Start(Parent());
CoroutineHandler.RaiseEvent(onParentCreated);
// Nested corotuine starting in OnFinished.
- p.OnFinished += ac => {
+ p.OnFinished += _ => {
CoroutineHandler.Start(Child());
CoroutineHandler.RaiseEvent(onChildCreated);
};