From b690d35a9941420e0643fef069712a34d1a34500 Mon Sep 17 00:00:00 2001
From: Nev3r <apophycens@gmail.com>
Date: Fri, 17 Apr 2020 11:43:37 +0200
Subject: [PATCH] Move the global taglist init functionality to the taglist
 files.

---
 src/p_spec.c  | 23 +----------------------
 src/taglist.c | 33 ++++++++++++++++++++++++++++++---
 src/taglist.h |  4 +---
 3 files changed, 32 insertions(+), 28 deletions(-)

diff --git a/src/p_spec.c b/src/p_spec.c
index 7abf8cbf4..4e833ba6d 100644
--- a/src/p_spec.c
+++ b/src/p_spec.c
@@ -1445,7 +1445,6 @@ void P_RunNightsCapsuleTouchExecutors(mobj_t *actor, boolean entering, boolean e
 static inline void P_InitTagLists(void)
 {
 	register size_t i;
-	size_t j;
 
 	for (i = numsectors - 1; i != (size_t)-1; i--)
 	{
@@ -1461,27 +1460,7 @@ static inline void P_InitTagLists(void)
 		lines[j].firsttag = (INT32)i;
 	}
 
-	for (i = 0; i < MAXTAGS; i++)
-	{
-		tags_sectors[i] = NULL;
-		tags_lines[i] = NULL;
-		tags_mapthings[i] = NULL;
-	}
-	for (i = 0; i < numsectors; i++)
-	{
-		for (j = 0; j < sectors[i].tags.count; j++)
-			Taglist_AddToSectors(sectors[i].tags.tags[j], i);
-	}
-	for (i = 0; i < numlines; i++)
-	{
-		for (j = 0; j < lines[i].tags.count; j++)
-			Taglist_AddToLines(lines[i].tags.tags[j], i);
-	}
-	for (i = 0; i < nummapthings; i++)
-	{
-		for (j = 0; j < mapthings[i].tags.count; j++)
-			Taglist_AddToMapthings(mapthings[i].tags.tags[j], i);
-	}
+	Taglist_InitGlobalTables();
 }
 
 /** Finds minimum light from an adjacent sector.
diff --git a/src/taglist.c b/src/taglist.c
index 0b7c8e23b..99d23bf5f 100644
--- a/src/taglist.c
+++ b/src/taglist.c
@@ -63,7 +63,7 @@ boolean Tag_Compare (const taglist_t* list1, const taglist_t* list2)
 	return true;
 }
 
-void Taglist_AddToSectors (const mtag_t tag, const size_t itemid)
+static void Taglist_AddToSectors (const mtag_t tag, const size_t itemid)
 {
 	taggroup_t* tagelems;
 
@@ -79,7 +79,7 @@ void Taglist_AddToSectors (const mtag_t tag, const size_t itemid)
 	tagelems->elements[tagelems->count - 1] = itemid;
 }
 
-void Taglist_AddToLines (const mtag_t tag, const size_t itemid)
+static void Taglist_AddToLines (const mtag_t tag, const size_t itemid)
 {
 	taggroup_t* tagelems;
 
@@ -95,7 +95,7 @@ void Taglist_AddToLines (const mtag_t tag, const size_t itemid)
 	tagelems->elements[tagelems->count - 1] = itemid;
 }
 
-void Taglist_AddToMapthings (const mtag_t tag, const size_t itemid)
+static void Taglist_AddToMapthings (const mtag_t tag, const size_t itemid)
 {
 	taggroup_t* tagelems;
 
@@ -111,6 +111,33 @@ void Taglist_AddToMapthings (const mtag_t tag, const size_t itemid)
 	tagelems->elements[tagelems->count - 1] = itemid;
 }
 
+void Taglist_InitGlobalTables(void)
+{
+	size_t i, j;
+
+	for (i = 0; i < MAXTAGS; i++)
+	{
+		tags_sectors[i] = NULL;
+		tags_lines[i] = NULL;
+		tags_mapthings[i] = NULL;
+	}
+	for (i = 0; i < numsectors; i++)
+	{
+		for (j = 0; j < sectors[i].tags.count; j++)
+			Taglist_AddToSectors(sectors[i].tags.tags[j], i);
+	}
+	for (i = 0; i < numlines; i++)
+	{
+		for (j = 0; j < lines[i].tags.count; j++)
+			Taglist_AddToLines(lines[i].tags.tags[j], i);
+	}
+	for (i = 0; i < nummapthings; i++)
+	{
+		for (j = 0; j < mapthings[i].tags.count; j++)
+			Taglist_AddToMapthings(mapthings[i].tags.tags[j], i);
+	}
+}
+
 INT32 Tag_Iterate_Sectors (const mtag_t tag, const size_t p)
 {
 	if (tag == MTAG_GLOBAL)
diff --git a/src/taglist.h b/src/taglist.h
index c22f9f277..b14c316ff 100644
--- a/src/taglist.h
+++ b/src/taglist.h
@@ -33,9 +33,7 @@ taggroup_t* tags_sectors[MAXTAGS + 1];
 taggroup_t* tags_lines[MAXTAGS + 1];
 taggroup_t* tags_mapthings[MAXTAGS + 1];
 
-void Taglist_AddToSectors (const mtag_t tag, const size_t itemid);
-void Taglist_AddToLines (const mtag_t tag, const size_t itemid);
-void Taglist_AddToMapthings (const mtag_t tag, const size_t itemid);
+void Taglist_InitGlobalTables(void);
 
 INT32 Tag_Iterate_Sectors (const mtag_t tag, const size_t p);
 INT32 Tag_Iterate_Lines (const mtag_t tag, const size_t p);