From f540156bbfa48f65c76c632c52bdda29b39eae85 Mon Sep 17 00:00:00 2001
From: Sally Coolatta <tehrealsalt@gmail.com>
Date: Sun, 28 Feb 2021 23:11:51 -0500
Subject: [PATCH] Fully fix taglist for james scroller

---
 src/p_spec.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/p_spec.c b/src/p_spec.c
index 300e9b51a..0b373cee1 100644
--- a/src/p_spec.c
+++ b/src/p_spec.c
@@ -7283,6 +7283,9 @@ static void P_SpawnScrollers(void)
 		INT32 control = -1, accel = 0; // no control sector or acceleration
 		INT32 special = l->special;
 
+		register INT32 s;
+		TAG_ITER_DECLARECOUNTER(0);
+
 		tag = Tag_FGet(&l->tags);
 
 		// These types are same as the ones they get set to except that the
@@ -7324,9 +7327,6 @@ static void P_SpawnScrollers(void)
 
 		switch (special)
 		{
-			register INT32 s;
-			TAG_ITER_DECLARECOUNTER(0);
-
 			case 513: // scroll effect ceiling
 			case 533: // scroll and carry objects on ceiling
 				TAG_ITER_SECTORS(0, tag, s)
@@ -7413,7 +7413,7 @@ static void P_SpawnScrollers(void)
 				break;
 
 			case 509: // scroll front and backside of tagged lines
-				for (s = -1; (s = P_FindLineFromTag(l->tag, s)) >= 0 ;)
+				TAG_ITER_LINES(0, tag, s)
 				{
 					if (s != (INT32)i)
 					{