aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormarcinzelent <zelent.marcin@gmail.com>2019-04-27 20:27:35 +0200
committermarcinzelent <zelent.marcin@gmail.com>2019-04-27 20:27:35 +0200
commita227d09d68187f80d620e2021be2c84979498710 (patch)
tree476510dc4f2358cfa0fe743fafe08976ea55a94c /nGJ2019/Assets/Scripts/EventTimeline.cs
parent8973398675a1ea012da316f791448d9437fc8528 (diff)
Fixed messaging breaking spawning
Diffstat (limited to 'nGJ2019/Assets/Scripts/EventTimeline.cs')
-rw-r--r--nGJ2019/Assets/Scripts/EventTimeline.cs7
1 files changed, 5 insertions, 2 deletions
diff --git a/nGJ2019/Assets/Scripts/EventTimeline.cs b/nGJ2019/Assets/Scripts/EventTimeline.cs
index b864ae7..18b87cc 100644
--- a/nGJ2019/Assets/Scripts/EventTimeline.cs
+++ b/nGJ2019/Assets/Scripts/EventTimeline.cs
@@ -60,17 +60,20 @@ public class EventTimeline
{
currentTime += deltaTime;
- while(futureEvents.Count > 0 && currentTime > futureEvents[0].time && futureMessages.Count > 0 && currentTime > futureMessages[0].time)
+ while(futureEvents.Count > 0 && currentTime > futureEvents[0].time)
{
SpawnEvent e = futureEvents[0];
futureEvents.RemoveAt(0);
if(OnSpawnEvent != null)
OnSpawnEvent(e);
+ }
+ while(futureMessages.Count > 0 && currentTime > futureMessages[0].time)
+ {
MessageEvent m = futureMessages[0];
futureMessages.RemoveAt(0);
if(OnMessageEvent != null)
OnMessageEvent(m);
- }
+ }
}
}