From 8a300b99e9fec79a02831fcf387715330ac67f9b Mon Sep 17 00:00:00 2001 From: "alexey.lysiuk" Date: Sat, 10 Jun 2017 15:50:44 +0300 Subject: [PATCH] Fixed interpolation points chaining Ambush flag cannot be used for marking visited points because HandleSpawnFlags() is no longer virtual See E1M4 from Rise Of The Wool Ball v1.1 as example of broken chain --- wadsrc/static/zscript/shared/movingcamera.txt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/wadsrc/static/zscript/shared/movingcamera.txt b/wadsrc/static/zscript/shared/movingcamera.txt index c6af13b42..6ed206d4b 100644 --- a/wadsrc/static/zscript/shared/movingcamera.txt +++ b/wadsrc/static/zscript/shared/movingcamera.txt @@ -45,6 +45,8 @@ class InterpolationPoint : Actor { InterpolationPoint Next; + + bool bVisited; default { @@ -66,9 +68,9 @@ class InterpolationPoint : Actor while (me != null) { - if (me.bAmbush) return; + if (me.bVisited) return; - me.bAmbush = true; + me.bVisited = true; let iterator = ActorIterator.Create(me.args[3] + 256 * me.args[4], "InterpolationPoint"); me.Next = InterpolationPoint(iterator.Next ());