From d775a42e93a274fd054aaf07991381aec1902fc6 Mon Sep 17 00:00:00 2001
From: Nev3r <apophycens@gmail.com>
Date: Fri, 17 Apr 2020 23:32:24 +0200
Subject: [PATCH] Rewrote a bit of the boss 4 code, which still requires
 working dynamic global tag lists.

---
 src/p_mobj.c | 23 +++++++++--------------
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/src/p_mobj.c b/src/p_mobj.c
index 180376727..9cfc15113 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -4622,16 +4622,18 @@ static boolean P_Boss4MoveCage(mobj_t *mobj, fixed_t delta)
 	const UINT16 tag = 65534 + (mobj->spawnpoint ? mobj->spawnpoint->extrainfo*LE_PARAMWIDTH : 0);
 	INT32 snum;
 	sector_t *sector;
-	for (snum = sectors[tag%numsectors].firsttag; snum != -1; snum = sector->nexttag)
+	boolean gotcage = false;
+	TAG_ITER_C
+
+	TAG_ITER_SECTORS(tag, snum)
 	{
 		sector = &sectors[snum];
-		if (!Tag_Find(&sector->tags, tag))
-			continue;
 		sector->floorheight += delta;
 		sector->ceilingheight += delta;
 		P_CheckSector(sector, true);
+		gotcage = true;
 	}
-	return sectors[tag%numsectors].firsttag != -1;
+	return gotcage;
 }
 
 // Move Boss4's arms to angle
@@ -4703,22 +4705,15 @@ static void P_Boss4PinchSpikeballs(mobj_t *mobj, angle_t angle, fixed_t dz)
 static void P_Boss4DestroyCage(mobj_t *mobj)
 {
 	const UINT16 tag = 65534 + (mobj->spawnpoint ? mobj->spawnpoint->extrainfo*LE_PARAMWIDTH : 0);
-	INT32 snum, next;
+	INT32 snum;
 	size_t a;
 	sector_t *sector, *rsec;
 	ffloor_t *rover;
+	TAG_ITER_C
 
-	// This will be the final iteration of sector tag.
-	// We'll destroy the tag list as we go.
-	next = sectors[tag%numsectors].firsttag;
-	sectors[tag%numsectors].firsttag = -1;
-
-	for (snum = next; snum != -1; snum = next)
+	TAG_ITER_SECTORS(tag, snum)
 	{
 		sector = &sectors[snum];
-
-		next = sector->nexttag;
-		sector->nexttag = -1;
 		if (!Tag_Find(&sector->tags, tag))
 			continue;
 		Tag_SectorFSet(sector - sectors, 0);