From caa531486696472f460782a89d66621af263051c Mon Sep 17 00:00:00 2001
From: Sally Coolatta <tehrealsalt@gmail.com>
Date: Sun, 28 Feb 2021 22:58:30 -0500
Subject: [PATCH] Get past some taglist stuff

---
 src/p_setup.c       |  5 +----
 src/p_spec.c        | 19 +++++++++----------
 src/slope_anchors.c | 16 ++++++++++------
 3 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/p_setup.c b/src/p_setup.c
index 91573601f..56a15eb46 100644
--- a/src/p_setup.c
+++ b/src/p_setup.c
@@ -3219,7 +3219,7 @@ static void P_ConvertBinaryMap(void)
 		{
 			INT32 firstline = P_FindSpecialLineFromTag(2000, mapthings[i].angle, -1);
 
-			mapthings[i].tag = mapthings[i].angle;
+			Tag_FSet(&mapthings[i].tags, mapthings[i].angle);
 			mapthings[i].args[0] = mapthings[i].z;
 			mapthings[i].args[2] = mapthings[i].extrainfo;
 			mapthings[i].z = 0;
@@ -3944,9 +3944,6 @@ boolean P_LoadLevel(boolean fromnetsave, boolean reloadinggamestate)
 	// Cancel all d_main.c fadeouts (keep fade in though).
 	if (reloadinggamestate)
 		wipegamestate = gamestate; // Don't fade if reloading the gamestate
-	else
-		wipegamestate = FORCEWIPEOFF;
-	//wipestyleflags = 0;
 
 	// Special stage & record attack retry fade to white
 	// This is handled BEFORE sounds are stopped.
diff --git a/src/p_spec.c b/src/p_spec.c
index 4ac680f31..4b04be5d8 100644
--- a/src/p_spec.c
+++ b/src/p_spec.c
@@ -3785,7 +3785,7 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
 					break;
 				}
 
-				while ((secnum = P_FindSectorFromTag(line->tag, secnum)) >= 0)
+				TAG_ITER_SECTORS(0, tag, secnum)
 				{
 					sec = sectors + secnum;
 
@@ -4749,10 +4749,6 @@ DoneSection2:
 				if (player->mo->tracer && player->mo->tracer->type == MT_TUBEWAYPOINT && player->powers[pw_carry] == CR_ZOOMTUBE)
 					break;
 
-				//initialize resulthigh and resultlow with 0
-				memset(&resultlow, 0x00, sizeof(resultlow));
-				memset(&resulthigh, 0x00, sizeof(resulthigh));
-
 				// Find line #11 tagged to this sector
 				lineindex = Tag_FindLineSpecial(11, sectag);
 
@@ -6927,11 +6923,14 @@ void P_SpawnSpecialsAfterSlopes(void)
 		switch (lines[i].special)
 		{
 			case 80: // Raise tagged things by type to this FOF
-				P_RaiseTaggedThingsToFakeFloor(
-						( sides[lines[i].sidenum[0]].textureoffset >> FRACBITS ),
-						lines[i].tag,
-						lines[i].frontsector
-				);
+				{
+					mtag_t tag = Tag_FGet(&lines[i].tags);
+					P_RaiseTaggedThingsToFakeFloor(
+							( sides[lines[i].sidenum[0]].textureoffset >> FRACBITS ),
+							tag,
+							lines[i].frontsector
+					);
+				}
 				break;
 		}
 	}
diff --git a/src/slope_anchors.c b/src/slope_anchors.c
index 69dc504a6..071dfe7c2 100644
--- a/src/slope_anchors.c
+++ b/src/slope_anchors.c
@@ -9,6 +9,8 @@
 /// \brief Charyb's vertex slope anchors.
 ///        This file is self contained to avoid a Big Large merge conflict.
 
+#include "taglist.h"
+
 /*
 FIXME
 FIXME
@@ -188,7 +190,7 @@ get_anchor
 		mapthing_t               **      anchors,
 		fixed_t                     distances[3],
 		const struct anchor_list  * list,
-		const INT16                 tag,
+		const mtag_t                tag,
 		const vertex_t            * v
 ){
 	size_t i;
@@ -238,7 +240,7 @@ get_sector_anchors
 		mapthing_t               **      anchors,
 		fixed_t                     distances[3],
 		const struct anchor_list  * list,
-		const INT16                 tag,
+		const mtag_t                tag,
 		const sector_t            * sector
 ){
 	size_t i;
@@ -255,7 +257,7 @@ find_closest_anchors
 (
 		const sector_t           * sector,
 		const struct anchor_list * list,
-		const INT16                tag
+		const mtag_t               tag
 ){
 	fixed_t distances[3] = { INT32_MAX, INT32_MAX, INT32_MAX };
 
@@ -400,7 +402,7 @@ slope_sector
 		sector_t                 * sector,
 		const INT16                flags,
 		const struct anchor_list * list,
-		const INT16                tag
+		const mtag_t               tag
 ){
 	mapthing_t ** anchors = find_closest_anchors(sector, list, tag);
 
@@ -436,6 +438,8 @@ make_anchored_slope
 
 	sector_t   *  s;
 
+	mtag_t tag = Tag_FGet(&line->tags);
+
 	if (side == 0 || flags & ML_TWOSIDED)
 	{
 		s = sides[line->sidenum[side]].sector;
@@ -448,13 +452,13 @@ make_anchored_slope
 		if (plane & FLOOR)
 		{
 			slope_sector
-				(&s->f_slope, &s->c_slope, s, flags, &floor_anchors, line->tag);
+				(&s->f_slope, &s->c_slope, s, flags, &floor_anchors, tag);
 		}
 
 		if (plane & CEILING)
 		{
 			slope_sector
-				(&s->c_slope, &s->f_slope, s, flags, &ceiling_anchors, line->tag);
+				(&s->c_slope, &s->f_slope, s, flags, &ceiling_anchors, tag);
 		}
 	}
 }