From c5c78df94647a01a69f8c4297f64e0f576b2dd3f Mon Sep 17 00:00:00 2001
From: toaster <rollerorbital@gmail.com>
Date: Wed, 12 Jul 2023 13:17:09 +0100
Subject: [PATCH 01/12] Linedef Action 460 (Award Rings) now supports negative
 ring counts

UDMF now has a native ring drainer effect.

Also fixes the WriteTextmap warning for the deprecated sector effect, which should have been encouraging you to use this action, not action 462!?
---
 src/p_setup.c |  2 +-
 src/p_spec.c  | 25 +++++++++++++++++++------
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/src/p_setup.c b/src/p_setup.c
index 27b771df1..985414775 100644
--- a/src/p_setup.c
+++ b/src/p_setup.c
@@ -2379,7 +2379,7 @@ static void P_WriteTextmap(void)
 		{
 			case 9:
 			case 10:
-				CONS_Alert(CONS_WARNING, M_GetText("Sector %s has ring drainer effect, which is not supported in UDMF. Use action 462 instead.\n"), sizeu1(i));
+				CONS_Alert(CONS_WARNING, M_GetText("Sector %s has ring drainer effect, which is not supported in UDMF. Use action 460 instead.\n"), sizeu1(i));
 				break;
 			default:
 				break;
diff --git a/src/p_spec.c b/src/p_spec.c
index d43c6e07b..d03505ea4 100644
--- a/src/p_spec.c
+++ b/src/p_spec.c
@@ -4194,17 +4194,30 @@ boolean P_ProcessSpecial(activator_t *activator, INT16 special, INT32 *args, cha
 			{
 				INT16 rings = args[0];
 				INT32 delay = args[1];
-				if (mo && mo->player)
+				if (
+					mo && mo->player // Player
+					&& rings != 0 // Any effect
+					&& (delay <= 0 || !(leveltime % delay)) // Timing
+				)
 				{
-					// Don't award rings while SPB is targetting you
-					if (mo->player->pflags & PF_RINGLOCK)
-						return false;
-
-					if (delay <= 0 || !(leveltime % delay))
+					if (rings > 0)
 					{
+						// Don't award rings while SPB is targetting you
+						if (mo->player->pflags & PF_RINGLOCK)
+							return false;
+
 						// args[2]: don't cap rings to 20
 						K_AwardPlayerRings(mo->player, rings, args[2]);
 					}
+					else
+					{
+						// Don't push you below baseline
+						if (mo->player->rings < 0)
+							return false;
+
+						mo->player->rings--;
+						S_StartSound(mo, sfx_antiri);
+					}
 				}
 			}
 			break;

From ba5047459c2f5bac33c3e3d296815a55082ad3f5 Mon Sep 17 00:00:00 2001
From: toaster <rollerorbital@gmail.com>
Date: Wed, 12 Jul 2023 16:06:50 +0100
Subject: [PATCH 02/12] Remove last remnants of Action 434 ("Custom Power")

Had no behaviour, but was being processed
---
 src/p_setup.c | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/src/p_setup.c b/src/p_setup.c
index 985414775..50eb148cd 100644
--- a/src/p_setup.c
+++ b/src/p_setup.c
@@ -1229,7 +1229,6 @@ static void P_LoadSidedefs(UINT8 *data)
 			case 335: // Trigger linedef executor: Object dye - Each time
 			case 336: // Trigger linedef executor: Object dye - Once
 			case 425: // Calls P_SetMobjState on calling mobj
-			case 434: // Custom Power
 			case 442: // Calls P_SetMobjState on mobjs of a given type in the tagged sectors
 			case 443: // Calls a named Lua function
 			case 459: // Control text prompt (named tag)
@@ -5671,20 +5670,6 @@ static void P_ConvertBinaryLinedefTypes(void)
 		case 433: //Enable/disable gravity flip
 			lines[i].args[0] = !!(lines[i].flags & ML_NOCLIMB);
 			break;
-		case 434: //Award power-up
-			if (sides[lines[i].sidenum[0]].text)
-			{
-				lines[i].stringargs[0] = Z_Malloc(strlen(sides[lines[i].sidenum[0]].text) + 1, PU_LEVEL, NULL);
-				M_Memcpy(lines[i].stringargs[0], sides[lines[i].sidenum[0]].text, strlen(sides[lines[i].sidenum[0]].text) + 1);
-			}
-			if (lines[i].sidenum[1] != 0xffff && lines[i].flags & ML_BLOCKPLAYERS) // read power from back sidedef
-			{
-				lines[i].stringargs[1] = Z_Malloc(strlen(sides[lines[i].sidenum[1]].text) + 1, PU_LEVEL, NULL);
-				M_Memcpy(lines[i].stringargs[1], sides[lines[i].sidenum[1]].text, strlen(sides[lines[i].sidenum[1]].text) + 1);
-			}
-			else
-				P_WriteConstant((lines[i].flags & ML_NOCLIMB) ? -1 : (sides[lines[i].sidenum[0]].textureoffset >> FRACBITS), &lines[i].stringargs[1]);
-			break;
 		case 435: //Change plane scroller direction
 			lines[i].args[0] = tag;
 			lines[i].args[1] = R_PointToDist2(lines[i].v2->x, lines[i].v2->y, lines[i].v1->x, lines[i].v1->y) >> FRACBITS;

From 36e0a23c09e58516b35c73ad73ab9467705638cb Mon Sep 17 00:00:00 2001
From: toaster <rollerorbital@gmail.com>
Date: Wed, 12 Jul 2023 16:32:23 +0100
Subject: [PATCH 03/12] Remove console script support from maps

The linedef's behaviour was broken horribly by long map names, and it's not worth the effort to fix it for the following reasons.
- It was considered a security vulnerability to have free access to the console when it was written.
- The game literally had a cvar to disable running console scripts. That's "I am willingly distributing ActiveX Word Documents in 2023" levels of foolhardery.
- Anything GOOD it can do, both Lua and ACS can do better.
---
 src/d_netcmd.c   |  3 ---
 src/d_netcmd.h   |  1 -
 src/deh_soc.c    |  7 -------
 src/deh_tables.c |  1 -
 src/doomstat.h   |  2 +-
 src/p_setup.c    | 31 -------------------------------
 src/p_spec.c     | 12 ------------
 7 files changed, 1 insertion(+), 56 deletions(-)

diff --git a/src/d_netcmd.c b/src/d_netcmd.c
index 823099cf6..059a39b7a 100644
--- a/src/d_netcmd.c
+++ b/src/d_netcmd.c
@@ -547,8 +547,6 @@ consvar_t cv_inttime = CVAR_INIT ("inttime", "10", CV_SAVE|CV_NETVAR, inttime_co
 static CV_PossibleValue_t advancemap_cons_t[] = {{0, "Same"}, {1, "Next"}, {2, "Random"}, {3, "Vote"}, {0, NULL}};
 consvar_t cv_advancemap = CVAR_INIT ("advancemap", "Vote", CV_NETVAR, advancemap_cons_t, NULL);
 
-consvar_t cv_runscripts = CVAR_INIT ("runscripts", "Yes", 0, CV_YesNo, NULL);
-
 consvar_t cv_pause = CVAR_INIT ("pausepermission", "Server", CV_SAVE|CV_NETVAR, pause_cons_t, NULL);
 consvar_t cv_mute = CVAR_INIT ("mute", "Off", CV_NETVAR|CV_CALL, CV_OnOff, Mute_OnChange);
 
@@ -795,7 +793,6 @@ void D_RegisterServerCommands(void)
 
 	CV_RegisterVar(&cv_startinglives);
 	CV_RegisterVar(&cv_countdowntime);
-	CV_RegisterVar(&cv_runscripts);
 	CV_RegisterVar(&cv_overtime);
 	CV_RegisterVar(&cv_pause);
 	CV_RegisterVar(&cv_mute);
diff --git a/src/d_netcmd.h b/src/d_netcmd.h
index 154c09717..eb1e5232b 100644
--- a/src/d_netcmd.h
+++ b/src/d_netcmd.h
@@ -70,7 +70,6 @@ extern consvar_t cv_scrambleonchange;
 extern consvar_t cv_netstat;
 
 extern consvar_t cv_countdowntime;
-extern consvar_t cv_runscripts;
 extern consvar_t cv_mute;
 extern consvar_t cv_pause;
 
diff --git a/src/deh_soc.c b/src/deh_soc.c
index 48f4f6828..84b49aa76 100644
--- a/src/deh_soc.c
+++ b/src/deh_soc.c
@@ -1296,13 +1296,6 @@ void readlevelheader(MYFILE *f, char * name)
 				}
 			}
 			// Individual triggers for level flags, for ease of use (and 2.0 compatibility)
-			else if (fastcmp(word, "SCRIPTISFILE"))
-			{
-				if (i || word2[0] == 'T' || word2[0] == 'Y')
-					mapheaderinfo[num]->levelflags |= LF_SCRIPTISFILE;
-				else
-					mapheaderinfo[num]->levelflags &= ~LF_SCRIPTISFILE;
-			}
 			else if (fastcmp(word, "NOZONE"))
 			{
 				if (i || word2[0] == 'T' || word2[0] == 'Y')
diff --git a/src/deh_tables.c b/src/deh_tables.c
index 59af77da5..3db11e57e 100644
--- a/src/deh_tables.c
+++ b/src/deh_tables.c
@@ -6452,7 +6452,6 @@ struct int_const_s const INT_CONST[] = {
 	{"RF_GHOSTLYMASK",RF_GHOSTLYMASK},
 
 	// Level flags
-	{"LF_SCRIPTISFILE",LF_SCRIPTISFILE},
 	{"LF_NOZONE",LF_NOZONE},
 	{"LF_SECTIONRACE",LF_SECTIONRACE},
 	{"LF_SUBTRACTNUM",LF_SUBTRACTNUM},
diff --git a/src/doomstat.h b/src/doomstat.h
index 2fc4a3878..6c8bc76db 100644
--- a/src/doomstat.h
+++ b/src/doomstat.h
@@ -527,7 +527,7 @@ struct mapheader_t
 };
 
 // level flags
-#define LF_SCRIPTISFILE       (1<<0) ///< True if the script is a file, not a lump.
+//#define LF_(this slot is free) (1<<0)
 #define LF_NOZONE             (1<<1) ///< Don't include "ZONE" on level title
 #define LF_SECTIONRACE        (1<<2) ///< Section race level
 #define LF_SUBTRACTNUM        (1<<3) ///< Use subtractive position number (for bright levels)
diff --git a/src/p_setup.c b/src/p_setup.c
index 50eb148cd..1506d18c0 100644
--- a/src/p_setup.c
+++ b/src/p_setup.c
@@ -7515,34 +7515,6 @@ void P_RespawnThings(void)
 }
 #endif
 
-static void P_RunLevelScript(const char *scriptname)
-{
-	if (!(mapheaderinfo[gamemap-1]->levelflags & LF_SCRIPTISFILE))
-	{
-		lumpnum_t lumpnum;
-		char newname[9];
-
-		strncpy(newname, scriptname, 8);
-
-		newname[8] = '\0';
-
-		lumpnum = W_CheckNumForName(newname);
-
-		if (lumpnum == LUMPERROR || W_LumpLength(lumpnum) == 0)
-		{
-			CONS_Debug(DBG_SETUP, "SOC Error: script lump %s not found/not valid.\n", newname);
-			return;
-		}
-
-		COM_BufInsertText(W_CacheLumpNum(lumpnum, PU_CACHE));
-	}
-	else
-	{
-		COM_BufAddText(va("exec %s\n", scriptname));
-	}
-	COM_BufExecute(); // Run it!
-}
-
 static void P_ResetSpawnpoints(void)
 {
 	UINT8 i;
@@ -7994,9 +7966,6 @@ boolean P_LoadLevel(boolean fromnetsave, boolean reloadinggamestate)
 	if (mapheaderinfo[gamemap-1]->runsoc[0] != '#')
 		P_RunSOC(mapheaderinfo[gamemap-1]->runsoc);
 
-	if (cv_runscripts.value && mapheaderinfo[gamemap-1]->scriptname[0] != '#')
-		P_RunLevelScript(mapheaderinfo[gamemap-1]->scriptname);
-
 	P_InitLevelSettings();
 
 	for (i = 0; i <= r_splitscreen; i++)
diff --git a/src/p_spec.c b/src/p_spec.c
index d03505ea4..aa1e88256 100644
--- a/src/p_spec.c
+++ b/src/p_spec.c
@@ -2970,18 +2970,6 @@ boolean P_ProcessSpecial(activator_t *activator, INT16 special, INT32 *args, cha
 			P_PlaySFX(stringargs[0] ? get_number(stringargs[0]) : sfx_None, mo, callsec, args[3], args[1], args[2]);
 			break;
 
-		case 415: // Run a script
-			if (cv_runscripts.value)
-			{
-				lumpnum_t lumpnum = W_CheckNumForName(stringargs[0]);
-
-				if (lumpnum == LUMPERROR || W_LumpLength(lumpnum) == 0)
-					CONS_Debug(DBG_SETUP, "Line type 415 Executor: script lump %s not found/not valid.\n", stringargs[0]);
-				else
-					COM_BufInsertText(W_CacheLumpNum(lumpnum, PU_CACHE));
-			}
-			break;
-
 		case 416: // Spawn adjustable fire flicker
 			TAG_ITER_SECTORS(args[0], secnum)
 				P_SpawnAdjustableFireFlicker(&sectors[secnum], args[2],

From b61701a1bca09d27d60057ac08e4572be443379e Mon Sep 17 00:00:00 2001
From: toaster <rollerorbital@gmail.com>
Date: Wed, 12 Jul 2023 17:13:38 +0100
Subject: [PATCH 04/12] Tidier conversion of string properties to UDMF

Previously, concatenated texture field strings were turned to text, then had that string run through get_number, then had it converted back into a string to become a stringarg.

Now, the concatenated string is copied directly to the relevant stringarg.

This fixes an issue where a map with object or state properties would have "context drift" - breaking when the object or state list changed, due to differently ordered freeslots, or new hardcoded objects.

This is also made consistent and with less repeated code via the addition of multile P_Write functions to replace both P_WriteConstant and multiple copypasted blocks of zone allocation and memcpy.
- P_WriteDuplicateText -- fresh zone memory copy with PU_LEVEL
- P_WriteSkinColor -- converts ID to SKINCOLOR_ name, then runs it through P_WriteDuplicateText
- P_WriteSfx -- converts ID to SFX_ name, then runs it through P_WriteDuplicateText

In order to avoid making p_setup.c dependent on `deh_tables.h`, object type 1202 simply artifically produces the expected range of MT_ROCKCRUMBLE1 to MT_ROCKCRUMBLE16. It was technically possible to produce unexpected effects with extremely high offsets, but if your map was doing something like that, you're intelligent enough to go back and swap the MT_ constant out with your intended goal.
---
 src/p_setup.c | 225 +++++++++++++++++++++-----------------------------
 1 file changed, 95 insertions(+), 130 deletions(-)

diff --git a/src/p_setup.c b/src/p_setup.c
index 1506d18c0..1517c4d9c 100644
--- a/src/p_setup.c
+++ b/src/p_setup.c
@@ -1108,6 +1108,52 @@ static void P_InitializeSidedef(side_t *sd)
 	sd->colormap_data = NULL;
 }
 
+/* -- Reference implementation
+static void P_WriteConstant(INT32 constant, char **target)
+{
+	char buffer[12];
+	size_t len;
+
+	sprintf(buffer, "%d", constant);
+	len = strlen(buffer) + 1;
+	*target = Z_Malloc(len, PU_LEVEL, NULL);
+	M_Memcpy(*target, buffer, len);
+} */
+
+static void P_WriteDuplicateText(const char *text, char **target)
+{
+	if (text == NULL || text[0] == '\0')
+		return;
+
+	size_t len = strlen(text) + 1;
+	*target = Z_Malloc(len, PU_LEVEL, NULL);
+	M_Memcpy(*target, text, len);
+}
+
+static void P_WriteSkincolor(INT32 constant, char **target)
+{
+	if (constant <= SKINCOLOR_NONE
+	|| constant >= (INT32)numskincolors)
+		return;
+
+	P_WriteDuplicateText(
+		va("SKINCOLOR_%s", skincolors[constant].name),
+		target
+	);
+}
+
+static void P_WriteSfx(INT32 constant, char **target)
+{
+	if (constant <= sfx_None
+	|| constant >= (INT32)sfxfree)
+		return;
+
+	P_WriteDuplicateText(
+		va("sfx_%s", S_sfx[constant].name),
+		target
+	);
+}
+
 static void P_LoadSidedefs(UINT8 *data)
 {
 	mapsidedef_t *msd = (mapsidedef_t*)data;
@@ -1197,8 +1243,8 @@ static void P_LoadSidedefs(UINT8 *data)
 					char process[8 + 1];
 					M_Memcpy(process, msd->toptexture, 8);
 					process[8] = '\0';
-					sd->text = Z_Malloc(strlen(process) + 1, PU_LEVEL, NULL);
-					M_Memcpy(sd->text, process, strlen(process) + 1);
+
+					P_WriteDuplicateText(process, &sd->text);
 				}
 				break;
 			}
@@ -1207,21 +1253,13 @@ static void P_LoadSidedefs(UINT8 *data)
 			case 14: // Bustable block parameters
 			case 15: // Fan particle spawner parameters
 			{
-				char process[8*3+1];
-				memset(process,0,8*3+1);
-				sd->toptexture = sd->midtexture = sd->bottomtexture = 0;
-				if (msd->toptexture[0] == '-' && msd->toptexture[1] == '\0')
+				if (msd->toptexture[7] == '\0' && strcasecmp(msd->toptexture, "MT_NULL") == 0)
+				{
+					// Don't bulk the conversion with irrelevant types
 					break;
-				else
-					M_Memcpy(process,msd->toptexture,8);
-				if (msd->midtexture[0] != '-' || msd->midtexture[1] != '\0')
-					M_Memcpy(process+strlen(process), msd->midtexture, 8);
-				if (msd->bottomtexture[0] != '-' || msd->bottomtexture[1] != '\0')
-					M_Memcpy(process+strlen(process), msd->bottomtexture, 8);
-				sd->toptexture = get_number(process);
-				break;
+				}
 			}
-
+			// FALLTHRU
 			case 331: // Trigger linedef executor: Skin - Continuous
 			case 332: // Trigger linedef executor: Skin - Each time
 			case 333: // Trigger linedef executor: Skin - Once
@@ -1250,8 +1288,8 @@ static void P_LoadSidedefs(UINT8 *data)
 					M_Memcpy(process+strlen(process), msd->midtexture, 8);
 				if (msd->bottomtexture[0] != '-' || msd->bottomtexture[1] != '\0')
 					M_Memcpy(process+strlen(process), msd->bottomtexture, 8);
-				sd->text = Z_Malloc(strlen(process)+1, PU_LEVEL, NULL);
-				M_Memcpy(sd->text, process, strlen(process)+1);
+
+				P_WriteDuplicateText(process, &sd->text);
 				break;
 			}
 
@@ -3175,13 +3213,17 @@ static void P_ProcessLinedefsAfterSidedefs(void)
 		case 443: // Calls a named Lua function
 			if (sides[ld->sidenum[0]].text)
 			{
-				size_t len = strlen(sides[ld->sidenum[0]].text) + 1;
+				size_t len[2];
+				len[0] = strlen(sides[ld->sidenum[0]].text) + 1;
+				len[1] = 0;
+
 				if (ld->sidenum[1] != 0xffff && sides[ld->sidenum[1]].text)
-					len += strlen(sides[ld->sidenum[1]].text);
-				ld->text = Z_Malloc(len, PU_LEVEL, NULL);
-				M_Memcpy(ld->text, sides[ld->sidenum[0]].text, strlen(sides[ld->sidenum[0]].text) + 1);
-				if (ld->sidenum[1] != 0xffff && sides[ld->sidenum[1]].text)
-					M_Memcpy(ld->text + strlen(ld->text) + 1, sides[ld->sidenum[1]].text, strlen(sides[ld->sidenum[1]].text) + 1);
+					len[1] = strlen(sides[ld->sidenum[1]].text);
+
+				ld->text = Z_Malloc(len[0] + len[1], PU_LEVEL, NULL);
+				M_Memcpy(ld->text, sides[ld->sidenum[0]].text, len[0]);
+				if (len[1])
+					M_Memcpy(ld->text + len[0], sides[ld->sidenum[1]].text, len[1] + 1);
 			}
 			break;
 		case 447: // Change colormap
@@ -4337,14 +4379,6 @@ static void P_AddBinaryMapTags(void)
 	}
 }
 
-static void P_WriteConstant(INT32 constant, char **target)
-{
-	char buffer[12];
-	sprintf(buffer, "%d", constant);
-	*target = Z_Malloc(strlen(buffer) + 1, PU_LEVEL, NULL);
-	M_Memcpy(*target, buffer, strlen(buffer) + 1);
-}
-
 static line_t *P_FindPointPushLine(taglist_t *list)
 {
 	INT32 i, l;
@@ -4584,7 +4618,7 @@ static void P_ConvertBinaryLinedefTypes(void)
 			lines[i].args[0] = sides[lines[i].sidenum[0]].textureoffset >> FRACBITS;
 			lines[i].args[1] = sides[lines[i].sidenum[0]].rowoffset >> FRACBITS;
 			lines[i].args[2] = !!(lines[i].flags & ML_SKEWTD);
-			P_WriteConstant(sides[lines[i].sidenum[0]].toptexture, &lines[i].stringargs[0]);
+			P_WriteDuplicateText(sides[lines[i].sidenum[0]].text, &lines[i].stringargs[0]);
 			break;
 		case 16: //Minecart parameters
 			lines[i].args[0] = sides[lines[i].sidenum[0]].textureoffset >> FRACBITS;
@@ -5059,7 +5093,7 @@ static void P_ConvertBinaryLinedefTypes(void)
 				lines[i].args[2] = 16;
 			}
 			if (lines[i].flags & ML_MIDSOLID)
-				P_WriteConstant(sides[lines[i].sidenum[0]].textureoffset >> FRACBITS, &lines[i].stringargs[0]);
+				P_WriteSfx(sides[lines[i].sidenum[0]].textureoffset >> FRACBITS, &lines[i].stringargs[0]);
 			if (lines[i].flags & ML_SKEWTD) // Kart Z delay. Yes, it used the same field as the above.
 				lines[i].args[3] = (unsigned)(sides[lines[i].sidenum[0]].textureoffset >> FRACBITS);
 			break;
@@ -5328,11 +5362,7 @@ static void P_ConvertBinaryLinedefTypes(void)
 			else
 				lines[i].args[0] = TMT_CONTINUOUS;
 			lines[i].args[1] = !!(lines[i].flags & ML_NOCLIMB);
-			if (lines[i].text)
-			{
-				lines[i].stringargs[0] = Z_Malloc(strlen(lines[i].text) + 1, PU_LEVEL, NULL);
-				M_Memcpy(lines[i].stringargs[0], lines[i].text, strlen(lines[i].text) + 1);
-			}
+			P_WriteDuplicateText(lines[i].text, &lines[i].stringargs[0]);
 			lines[i].special = 331;
 			break;
 		case 334: // Object dye - continuous
@@ -5345,11 +5375,7 @@ static void P_ConvertBinaryLinedefTypes(void)
 			else
 				lines[i].args[0] = TMT_CONTINUOUS;
 			lines[i].args[1] = !!(lines[i].flags & ML_NOCLIMB);
-			if (sides[lines[i].sidenum[0]].text)
-			{
-				lines[i].stringargs[0] = Z_Malloc(strlen(sides[lines[i].sidenum[0]].text) + 1, PU_LEVEL, NULL);
-				M_Memcpy(lines[i].stringargs[0], sides[lines[i].sidenum[0]].text, strlen(sides[lines[i].sidenum[0]].text) + 1);
-			}
+			P_WriteDuplicateText(sides[lines[i].sidenum[0]].text, &lines[i].stringargs[0]);
 			lines[i].special = 334;
 			break;
 		case 337: //Emerald check - continuous
@@ -5488,11 +5514,7 @@ static void P_ConvertBinaryLinedefTypes(void)
 			lines[i].args[5] = (lines[i].sidenum[1] != 0xffff) ? sides[lines[i].sidenum[1]].textureoffset >> FRACBITS : 0;
 			lines[i].args[6] = (lines[i].sidenum[1] != 0xffff) ? sides[lines[i].sidenum[1]].rowoffset >> FRACBITS : -1;
 			lines[i].args[7] = sides[lines[i].sidenum[0]].bottomtexture;
-			if (sides[lines[i].sidenum[0]].text)
-			{
-				lines[i].stringargs[0] = Z_Malloc(strlen(sides[lines[i].sidenum[0]].text) + 1, PU_LEVEL, NULL);
-				M_Memcpy(lines[i].stringargs[0], sides[lines[i].sidenum[0]].text, strlen(sides[lines[i].sidenum[0]].text) + 1);
-			}
+			P_WriteDuplicateText(sides[lines[i].sidenum[0]].text, &lines[i].stringargs[0]);
 			break;
 		case 414: //Play sound effect
 			lines[i].args[3] = tag;
@@ -5532,37 +5554,8 @@ static void P_ConvertBinaryLinedefTypes(void)
 					lines[i].args[2] = TMSL_EVERYONE;
 				}
 			}
-			if (sides[lines[i].sidenum[0]].text)
-			{
-				lines[i].stringargs[0] = Z_Malloc(strlen(sides[lines[i].sidenum[0]].text) + 1, PU_LEVEL, NULL);
-				M_Memcpy(lines[i].stringargs[0], sides[lines[i].sidenum[0]].text, strlen(sides[lines[i].sidenum[0]].text) + 1);
-			}
+			P_WriteDuplicateText(sides[lines[i].sidenum[0]].text, &lines[i].stringargs[0]);
 			break;
-		case 415: //Run script
-		{
-			INT32 scrnum;
-
-			lines[i].stringargs[0] = Z_Malloc(9, PU_LEVEL, NULL);
-			strcpy(lines[i].stringargs[0], G_BuildMapName(gamemap));
-			lines[i].stringargs[0][0] = 'S';
-			lines[i].stringargs[0][1] = 'C';
-			lines[i].stringargs[0][2] = 'R';
-
-			scrnum = sides[lines[i].sidenum[0]].textureoffset >> FRACBITS;
-			if (scrnum < 0 || scrnum > 999)
-			{
-				scrnum = 0;
-				lines[i].stringargs[0][5] = lines[i].stringargs[0][6] = lines[i].stringargs[0][7] = '0';
-			}
-			else
-			{
-				lines[i].stringargs[0][5] = (char)('0' + (char)((scrnum / 100)));
-				lines[i].stringargs[0][6] = (char)('0' + (char)((scrnum % 100) / 10));
-				lines[i].stringargs[0][7] = (char)('0' + (char)(scrnum % 10));
-			}
-			lines[i].stringargs[0][8] = '\0';
-			break;
-		}
 		case 416: //Start adjustable flickering light
 		case 417: //Start adjustable pulsating light
 		case 602: //Adjustable pulsating light
@@ -5628,11 +5621,7 @@ static void P_ConvertBinaryLinedefTypes(void)
 			lines[i].args[1] = !!(lines[i].flags & ML_NOCLIMB);
 			break;
 		case 425: //Change object state
-			if (sides[lines[i].sidenum[0]].text)
-			{
-				lines[i].stringargs[0] = Z_Malloc(strlen(sides[lines[i].sidenum[0]].text) + 1, PU_LEVEL, NULL);
-				M_Memcpy(lines[i].stringargs[0], sides[lines[i].sidenum[0]].text, strlen(sides[lines[i].sidenum[0]].text) + 1);
-			}
+			P_WriteDuplicateText(sides[lines[i].sidenum[0]].text, &lines[i].stringargs[0]);
 			break;
 		case 426: //Stop object
 			lines[i].args[0] = !!(lines[i].flags & ML_NOCLIMB);
@@ -5696,31 +5685,17 @@ static void P_ConvertBinaryLinedefTypes(void)
 			break;
 		case 442: //Change object type state
 			lines[i].args[2] = tag;
-			if (sides[lines[i].sidenum[0]].text)
-			{
-				lines[i].stringargs[0] = Z_Malloc(strlen(sides[lines[i].sidenum[0]].text) + 1, PU_LEVEL, NULL);
-				M_Memcpy(lines[i].stringargs[0], sides[lines[i].sidenum[0]].text, strlen(sides[lines[i].sidenum[0]].text) + 1);
-			}
+			P_WriteDuplicateText(sides[lines[i].sidenum[0]].text, &lines[i].stringargs[0]);
 			if (lines[i].sidenum[1] == 0xffff)
 				lines[i].args[3] = 1;
 			else
 			{
 				lines[i].args[3] = 0;
-				if (sides[lines[i].sidenum[1]].text)
-				{
-					lines[i].stringargs[1] = Z_Malloc(strlen(sides[lines[i].sidenum[1]].text) + 1, PU_LEVEL, NULL);
-					M_Memcpy(lines[i].stringargs[1], sides[lines[i].sidenum[1]].text, strlen(sides[lines[i].sidenum[1]].text) + 1);
-				}
+				P_WriteDuplicateText(sides[lines[i].sidenum[1]].text, &lines[i].stringargs[1]);
 			}
 			break;
 		case 443: //Call Lua function
-			if (lines[i].text)
-			{
-				lines[i].stringargs[0] = Z_Malloc(strlen(lines[i].text) + 1, PU_LEVEL, NULL);
-				M_Memcpy(lines[i].stringargs[0], lines[i].text, strlen(lines[i].text) + 1);
-			}
-			else
-				CONS_Alert(CONS_WARNING, "Linedef %s is missing the hook name of the Lua function to call! (This should be given in the front texture fields)\n", sizeu1(i));
+			P_WriteDuplicateText(lines[i].text, &lines[i].stringargs[0]);
 			break;
 		case 444: //Earthquake
 			lines[i].args[0] = P_AproxDistance(lines[i].dx, lines[i].dy) >> FRACBITS;
@@ -5872,11 +5847,7 @@ static void P_ConvertBinaryLinedefTypes(void)
 			if (lines[i].flags & ML_MIDSOLID)
 				lines[i].args[3] |= TMP_FREEZETHINKERS;*/
 			lines[i].args[4] = (lines[i].sidenum[1] != 0xFFFF) ? sides[lines[i].sidenum[1]].textureoffset >> FRACBITS : tag;
-			if (sides[lines[i].sidenum[0]].text)
-			{
-				lines[i].stringargs[0] = Z_Malloc(strlen(sides[lines[i].sidenum[0]].text) + 1, PU_LEVEL, NULL);
-				M_Memcpy(lines[i].stringargs[0], sides[lines[i].sidenum[0]].text, strlen(sides[lines[i].sidenum[0]].text) + 1);
-			}
+			P_WriteDuplicateText(sides[lines[i].sidenum[0]].text, &lines[i].stringargs[0]);
 			break;
 		case 460: //Award rings
 			lines[i].args[0] = sides[lines[i].sidenum[0]].textureoffset >> FRACBITS;
@@ -5905,18 +5876,10 @@ static void P_ConvertBinaryLinedefTypes(void)
 			}
 			else
 				lines[i].args[5] = 0;
-			if (sides[lines[i].sidenum[0]].text)
-			{
-				lines[i].stringargs[0] = Z_Malloc(strlen(sides[lines[i].sidenum[0]].text) + 1, PU_LEVEL, NULL);
-				M_Memcpy(lines[i].stringargs[0], sides[lines[i].sidenum[0]].text, strlen(sides[lines[i].sidenum[0]].text) + 1);
-			}
+			P_WriteDuplicateText(sides[lines[i].sidenum[0]].text, &lines[i].stringargs[0]);
 			break;
 		case 463: //Dye object
-			if (sides[lines[i].sidenum[0]].text)
-			{
-				lines[i].stringargs[0] = Z_Malloc(strlen(sides[lines[i].sidenum[0]].text) + 1, PU_LEVEL, NULL);
-				M_Memcpy(lines[i].stringargs[0], sides[lines[i].sidenum[0]].text, strlen(sides[lines[i].sidenum[0]].text) + 1);
-			}
+			P_WriteDuplicateText(sides[lines[i].sidenum[0]].text, &lines[i].stringargs[0]);
 			break;
 		case 464: //Trigger egg capsule
 			lines[i].args[0] = tag;
@@ -5935,11 +5898,7 @@ static void P_ConvertBinaryLinedefTypes(void)
 		case 476: // ACS_ExecuteAlways
 		case 477: // ACS_Suspend
 		case 478: // ACS_Terminate
-			if (sides[lines[i].sidenum[0]].text)
-			{
-				lines[i].stringargs[0] = Z_Malloc(strlen(sides[lines[i].sidenum[0]].text) + 1, PU_LEVEL, NULL);
-				M_Memcpy(lines[i].stringargs[0], sides[lines[i].sidenum[0]].text, strlen(sides[lines[i].sidenum[0]].text) + 1);
-			}
+			P_WriteDuplicateText(sides[lines[i].sidenum[0]].text, &lines[i].stringargs[0]);
 			break;
 		case 480: //Polyobject - door slide
 			lines[i].args[0] = tag;
@@ -6731,7 +6690,9 @@ static void P_ConvertBinaryThingTypes(void)
 			break;
 		case 543: //Balloon
 			if (mapthings[i].angle > 0)
-				P_WriteConstant(((mapthings[i].angle - 1) % (numskincolors - 1)) + 1, &mapthings[i].stringargs[0]);
+			{
+				P_WriteSkincolor(((mapthings[i].angle - 1) % (numskincolors - 1)) + 1, &mapthings[i].stringargs[0]);
+			}
 			mapthings[i].args[0] = !!(mapthings[i].options & MTF_AMBUSH);
 			break;
 		case 555: //Diagonal yellow spring
@@ -6756,22 +6717,22 @@ static void P_ConvertBinaryThingTypes(void)
 		case 706: //Water ambience G
 		case 707: //Water ambience H
 			mapthings[i].args[0] = 35;
-			P_WriteConstant(sfx_amwtr1 + mapthings[i].type - 700, &mapthings[i].stringargs[0]);
+			P_WriteSfx(sfx_amwtr1 + mapthings[i].type - 700, &mapthings[i].stringargs[0]);
 			mapthings[i].type = 700;
 			break;
 		case 708: //Disco ambience
 			mapthings[i].args[0] = 512;
-			P_WriteConstant(sfx_ambint, &mapthings[i].stringargs[0]);
+			P_WriteSfx(sfx_ambint, &mapthings[i].stringargs[0]);
 			mapthings[i].type = 700;
 			break;
 		case 709: //Volcano ambience
 			mapthings[i].args[0] = 220;
-			P_WriteConstant(sfx_ambin2, &mapthings[i].stringargs[0]);
+			P_WriteSfx(sfx_ambin2, &mapthings[i].stringargs[0]);
 			mapthings[i].type = 700;
 			break;
 		case 710: //Machine ambience
 			mapthings[i].args[0] = 24;
-			P_WriteConstant(sfx_ambmac, &mapthings[i].stringargs[0]);
+			P_WriteSfx(sfx_ambmac, &mapthings[i].stringargs[0]);
 			mapthings[i].type = 700;
 			break;
 		case 750: //Slope vertex
@@ -6834,8 +6795,7 @@ static void P_ConvertBinaryThingTypes(void)
 			mapthings[i].args[3] = sides[lines[j].sidenum[0]].rowoffset >> FRACBITS;
 			mapthings[i].args[4] = lines[j].backsector ? sides[lines[j].sidenum[1]].textureoffset >> FRACBITS : 0;
 			mapthings[i].args[6] = mapthings[i].angle;
-			if (sides[lines[j].sidenum[0]].toptexture)
-				P_WriteConstant(sides[lines[j].sidenum[0]].toptexture, &mapthings[i].stringargs[0]);
+			P_WriteDuplicateText(sides[lines[j].sidenum[0]].text, &mapthings[i].stringargs[0]);
 			break;
 		}
 		case 762: //PolyObject spawn point (crush)
@@ -6923,8 +6883,9 @@ static void P_ConvertBinaryThingTypes(void)
 				mapthings[i].args[8] |= TMM_ALWAYSTHINK;
 			if (mapthings[i].type == 1110)
 			{
-				P_WriteConstant(sides[lines[j].sidenum[0]].toptexture, &mapthings[i].stringargs[0]);
-				P_WriteConstant(lines[j].backsector ? sides[lines[j].sidenum[1]].toptexture : MT_NULL, &mapthings[i].stringargs[1]);
+				P_WriteDuplicateText(sides[lines[j].sidenum[0]].text, &mapthings[i].stringargs[0]);
+				if (lines[j].backsector)
+					P_WriteDuplicateText(sides[lines[j].sidenum[1]].text, &mapthings[i].stringargs[1]);
 			}
 			break;
 		}
@@ -6965,7 +6926,11 @@ static void P_ConvertBinaryThingTypes(void)
 			mapthings[i].args[0] = P_AproxDistance(lines[j].dx, lines[j].dy) >> FRACBITS;
 			mapthings[i].args[1] = sides[lines[j].sidenum[0]].textureoffset >> FRACBITS;
 			mapthings[i].args[2] = !!(lines[j].flags & ML_NOCLIMB);
-			P_WriteConstant(MT_ROCKCRUMBLE1 + (sides[lines[j].sidenum[0]].rowoffset >> FRACBITS), &mapthings[i].stringargs[0]);
+			INT32 id = (sides[lines[j].sidenum[0]].rowoffset >> FRACBITS);
+			// Rather than introduce deh_tables.h as a dependency for literally one
+			// conversion, we just... recreate the string expected to be produced.
+			if (id > 0 && id < 16)
+				P_WriteDuplicateText(va("MT_ROCKCRUMBLE%d", id+1), &mapthings[i].stringargs[0]);
 			break;
 		}
 		case 1221: //Minecart saloon door

From ed8007471fe84c7edbecd48a4daf008ad33d2ffd Mon Sep 17 00:00:00 2001
From: toaster <rollerorbital@gmail.com>
Date: Wed, 12 Jul 2023 18:37:00 +0100
Subject: [PATCH 05/12] Remove binary-relevant text field from side_t (and
 line_t)

Instead of storing this during binary-UDMF conversion and then copying it for certain argument fields, put it directly onto stringarg[0] (or [1] if it's the backside), then make relevant changes with those.

Reduces the amount of Zone memory used for binary converted maps, and the amount of struct memory used for all types of maps.

They have also been removed from the Lua API. Fret not, the stringargs on line_t have far more utility.
---
 src/lua_maplib.c | 11 ------
 src/p_setup.c    | 88 ++++++++++++++++++------------------------------
 src/r_defs.h     |  3 --
 3 files changed, 33 insertions(+), 69 deletions(-)

diff --git a/src/lua_maplib.c b/src/lua_maplib.c
index be2c3347b..c9ae8fca0 100644
--- a/src/lua_maplib.c
+++ b/src/lua_maplib.c
@@ -135,7 +135,6 @@ enum line_e {
 	line_frontsector,
 	line_backsector,
 	line_polyobj,
-	line_text,
 	line_callcount
 };
 
@@ -162,7 +161,6 @@ static const char *const line_opt[] = {
 	"frontsector",
 	"backsector",
 	"polyobj",
-	"text",
 	"callcount",
 	NULL};
 
@@ -177,7 +175,6 @@ enum side_e {
 	side_sector,
 	side_special,
 	side_repeatcnt,
-	side_text
 };
 
 static const char *const side_opt[] = {
@@ -191,7 +188,6 @@ static const char *const side_opt[] = {
 	"sector",
 	"special",
 	"repeatcnt",
-	"text",
 	NULL};
 
 enum vertex_e {
@@ -1088,9 +1084,6 @@ static int line_get(lua_State *L)
 	case line_polyobj:
 		LUA_PushUserdata(L, line->polyobj, META_POLYOBJ);
 		return 1;
-	case line_text:
-		lua_pushstring(L, line->text);
-		return 1;
 	case line_callcount:
 		lua_pushinteger(L, line->callcount);
 		return 1;
@@ -1187,9 +1180,6 @@ static int side_get(lua_State *L)
 	case side_repeatcnt:
 		lua_pushinteger(L, side->repeatcnt);
 		return 1;
-	case side_text:
-		lua_pushstring(L, side->text);
-		return 1;
 	}
 	return 0;
 }
@@ -1214,7 +1204,6 @@ static int side_set(lua_State *L)
 	case side_line:
 	case side_sector:
 	case side_special:
-	case side_text:
 	default:
 		return luaL_error(L, "side_t field " LUA_QS " cannot be set.", side_opt[field]);
 	case side_textureoffset:
diff --git a/src/p_setup.c b/src/p_setup.c
index 1517c4d9c..16ed24b9e 100644
--- a/src/p_setup.c
+++ b/src/p_setup.c
@@ -999,7 +999,6 @@ static void P_InitializeLinedef(line_t *ld)
 
 	ld->tripwire = false;
 
-	ld->text = NULL;
 	ld->callcount = 0;
 
 	// cph 2006/09/30 - fix sidedef errors right away.
@@ -1104,7 +1103,6 @@ static void P_InitializeSidedef(side_t *sd)
 		sd->special = sd->line->special;
 	}
 
-	sd->text = NULL;
 	sd->colormap_data = NULL;
 }
 
@@ -1199,6 +1197,9 @@ static void P_LoadSidedefs(UINT8 *data)
 
 			case 413: // Change music
 			{
+				if (!isfrontside)
+					break;
+
 				char process[8+1];
 
 				sd->toptexture = sd->midtexture = sd->bottomtexture = 0;
@@ -1216,35 +1217,38 @@ static void P_LoadSidedefs(UINT8 *data)
 					sd->midtexture = get_number(process);
 				}
 
- 				sd->text = Z_Malloc(7, PU_LEVEL, NULL);
-				if (isfrontside && !(msd->toptexture[0] == '-' && msd->toptexture[1] == '\0'))
+				if (msd->toptexture[0] != '-' && msd->toptexture[1] != '\0')
 				{
+					sd->line->stringargs[0] = Z_Malloc(7, PU_LEVEL, NULL);
 					M_Memcpy(process,msd->toptexture,8);
 					process[8] = '\0';
 
 					// If they type in O_ or D_ and their music name, just shrug,
 					// then copy the rest instead.
 					if ((process[0] == 'O' || process[0] == 'D') && process[7])
-						M_Memcpy(sd->text, process+2, 6);
+						M_Memcpy(sd->line->stringargs[0], process+2, 6);
 					else // Assume it's a proper music name.
-						M_Memcpy(sd->text, process, 6);
-					sd->text[6] = 0;
+						M_Memcpy(sd->line->stringargs[0], process, 6);
+					sd->line->stringargs[0][6] = '\0';
 				}
-				else
-					sd->text[0] = 0;
+
 				break;
 			}
 
 			case 414: // Play SFX
 			{
 				sd->toptexture = sd->midtexture = sd->bottomtexture = 0;
+
+				if (!isfrontside)
+					break;
+
 				if (msd->toptexture[0] != '-' || msd->toptexture[1] != '\0')
 				{
 					char process[8 + 1];
 					M_Memcpy(process, msd->toptexture, 8);
 					process[8] = '\0';
 
-					P_WriteDuplicateText(process, &sd->text);
+					P_WriteDuplicateText(process, &sd->line->stringargs[0]);
 				}
 				break;
 			}
@@ -1289,7 +1293,10 @@ static void P_LoadSidedefs(UINT8 *data)
 				if (msd->bottomtexture[0] != '-' || msd->bottomtexture[1] != '\0')
 					M_Memcpy(process+strlen(process), msd->bottomtexture, 8);
 
-				P_WriteDuplicateText(process, &sd->text);
+				P_WriteDuplicateText(
+					process,
+					&sd->line->stringargs[(isfrontside) ? 0 : 1]
+				);
 				break;
 			}
 
@@ -3206,24 +3213,25 @@ static void P_ProcessLinedefsAfterSidedefs(void)
 
 		switch (ld->special)
 		{
-		// Compile linedef 'text' from both sidedefs 'text' for appropriate specials.
+		// Compile linedef text from both sidedefs for appropriate specials.
 		case 331: // Trigger linedef executor: Skin - Continuous
 		case 332: // Trigger linedef executor: Skin - Each time
 		case 333: // Trigger linedef executor: Skin - Once
 		case 443: // Calls a named Lua function
-			if (sides[ld->sidenum[0]].text)
+			if (ld->stringargs[0] && ld->stringargs[1])
 			{
 				size_t len[2];
-				len[0] = strlen(sides[ld->sidenum[0]].text) + 1;
-				len[1] = 0;
+				len[0] = strlen(ld->stringargs[0]);
+				len[1] = strlen(ld->stringargs[1]);
 
-				if (ld->sidenum[1] != 0xffff && sides[ld->sidenum[1]].text)
-					len[1] = strlen(sides[ld->sidenum[1]].text);
-
-				ld->text = Z_Malloc(len[0] + len[1], PU_LEVEL, NULL);
-				M_Memcpy(ld->text, sides[ld->sidenum[0]].text, len[0]);
 				if (len[1])
-					M_Memcpy(ld->text + len[0], sides[ld->sidenum[1]].text, len[1] + 1);
+				{
+					ld->stringargs[0] = Z_Realloc(ld->stringargs[0], len[0] + len[1] + 1, PU_LEVEL, NULL);
+					M_Memcpy(ld->stringargs[0] + len[0] + 1, ld->stringargs[1], len[1] + 1);
+				}
+
+				Z_Free(ld->stringargs[1]);
+				ld->stringargs[1] = NULL;
 			}
 			break;
 		case 447: // Change colormap
@@ -4618,7 +4626,6 @@ static void P_ConvertBinaryLinedefTypes(void)
 			lines[i].args[0] = sides[lines[i].sidenum[0]].textureoffset >> FRACBITS;
 			lines[i].args[1] = sides[lines[i].sidenum[0]].rowoffset >> FRACBITS;
 			lines[i].args[2] = !!(lines[i].flags & ML_SKEWTD);
-			P_WriteDuplicateText(sides[lines[i].sidenum[0]].text, &lines[i].stringargs[0]);
 			break;
 		case 16: //Minecart parameters
 			lines[i].args[0] = sides[lines[i].sidenum[0]].textureoffset >> FRACBITS;
@@ -5362,7 +5369,6 @@ static void P_ConvertBinaryLinedefTypes(void)
 			else
 				lines[i].args[0] = TMT_CONTINUOUS;
 			lines[i].args[1] = !!(lines[i].flags & ML_NOCLIMB);
-			P_WriteDuplicateText(lines[i].text, &lines[i].stringargs[0]);
 			lines[i].special = 331;
 			break;
 		case 334: // Object dye - continuous
@@ -5375,7 +5381,6 @@ static void P_ConvertBinaryLinedefTypes(void)
 			else
 				lines[i].args[0] = TMT_CONTINUOUS;
 			lines[i].args[1] = !!(lines[i].flags & ML_NOCLIMB);
-			P_WriteDuplicateText(sides[lines[i].sidenum[0]].text, &lines[i].stringargs[0]);
 			lines[i].special = 334;
 			break;
 		case 337: //Emerald check - continuous
@@ -5514,7 +5519,6 @@ static void P_ConvertBinaryLinedefTypes(void)
 			lines[i].args[5] = (lines[i].sidenum[1] != 0xffff) ? sides[lines[i].sidenum[1]].textureoffset >> FRACBITS : 0;
 			lines[i].args[6] = (lines[i].sidenum[1] != 0xffff) ? sides[lines[i].sidenum[1]].rowoffset >> FRACBITS : -1;
 			lines[i].args[7] = sides[lines[i].sidenum[0]].bottomtexture;
-			P_WriteDuplicateText(sides[lines[i].sidenum[0]].text, &lines[i].stringargs[0]);
 			break;
 		case 414: //Play sound effect
 			lines[i].args[3] = tag;
@@ -5554,7 +5558,6 @@ static void P_ConvertBinaryLinedefTypes(void)
 					lines[i].args[2] = TMSL_EVERYONE;
 				}
 			}
-			P_WriteDuplicateText(sides[lines[i].sidenum[0]].text, &lines[i].stringargs[0]);
 			break;
 		case 416: //Start adjustable flickering light
 		case 417: //Start adjustable pulsating light
@@ -5620,9 +5623,6 @@ static void P_ConvertBinaryLinedefTypes(void)
 			lines[i].args[0] = sides[lines[i].sidenum[0]].textureoffset >> FRACBITS;
 			lines[i].args[1] = !!(lines[i].flags & ML_NOCLIMB);
 			break;
-		case 425: //Change object state
-			P_WriteDuplicateText(sides[lines[i].sidenum[0]].text, &lines[i].stringargs[0]);
-			break;
 		case 426: //Stop object
 			lines[i].args[0] = !!(lines[i].flags & ML_NOCLIMB);
 			break;
@@ -5685,17 +5685,7 @@ static void P_ConvertBinaryLinedefTypes(void)
 			break;
 		case 442: //Change object type state
 			lines[i].args[2] = tag;
-			P_WriteDuplicateText(sides[lines[i].sidenum[0]].text, &lines[i].stringargs[0]);
-			if (lines[i].sidenum[1] == 0xffff)
-				lines[i].args[3] = 1;
-			else
-			{
-				lines[i].args[3] = 0;
-				P_WriteDuplicateText(sides[lines[i].sidenum[1]].text, &lines[i].stringargs[1]);
-			}
-			break;
-		case 443: //Call Lua function
-			P_WriteDuplicateText(lines[i].text, &lines[i].stringargs[0]);
+			lines[i].args[3] = (lines[i].sidenum[1] == 0xffff) ? 1 : 0;
 			break;
 		case 444: //Earthquake
 			lines[i].args[0] = P_AproxDistance(lines[i].dx, lines[i].dy) >> FRACBITS;
@@ -5847,7 +5837,6 @@ static void P_ConvertBinaryLinedefTypes(void)
 			if (lines[i].flags & ML_MIDSOLID)
 				lines[i].args[3] |= TMP_FREEZETHINKERS;*/
 			lines[i].args[4] = (lines[i].sidenum[1] != 0xFFFF) ? sides[lines[i].sidenum[1]].textureoffset >> FRACBITS : tag;
-			P_WriteDuplicateText(sides[lines[i].sidenum[0]].text, &lines[i].stringargs[0]);
 			break;
 		case 460: //Award rings
 			lines[i].args[0] = sides[lines[i].sidenum[0]].textureoffset >> FRACBITS;
@@ -5876,10 +5865,6 @@ static void P_ConvertBinaryLinedefTypes(void)
 			}
 			else
 				lines[i].args[5] = 0;
-			P_WriteDuplicateText(sides[lines[i].sidenum[0]].text, &lines[i].stringargs[0]);
-			break;
-		case 463: //Dye object
-			P_WriteDuplicateText(sides[lines[i].sidenum[0]].text, &lines[i].stringargs[0]);
 			break;
 		case 464: //Trigger egg capsule
 			lines[i].args[0] = tag;
@@ -5894,12 +5879,6 @@ static void P_ConvertBinaryLinedefTypes(void)
 			lines[i].args[2] = TML_SECTOR;
 			lines[i].args[3] = !!(lines[i].flags & ML_MIDPEG);
 			break;
-		case 475: // ACS_Execute
-		case 476: // ACS_ExecuteAlways
-		case 477: // ACS_Suspend
-		case 478: // ACS_Terminate
-			P_WriteDuplicateText(sides[lines[i].sidenum[0]].text, &lines[i].stringargs[0]);
-			break;
 		case 480: //Polyobject - door slide
 			lines[i].args[0] = tag;
 			lines[i].args[1] = sides[lines[i].sidenum[0]].textureoffset >> FRACBITS;
@@ -6795,7 +6774,7 @@ static void P_ConvertBinaryThingTypes(void)
 			mapthings[i].args[3] = sides[lines[j].sidenum[0]].rowoffset >> FRACBITS;
 			mapthings[i].args[4] = lines[j].backsector ? sides[lines[j].sidenum[1]].textureoffset >> FRACBITS : 0;
 			mapthings[i].args[6] = mapthings[i].angle;
-			P_WriteDuplicateText(sides[lines[j].sidenum[0]].text, &mapthings[i].stringargs[0]);
+			P_WriteDuplicateText(lines[j].stringargs[0], &mapthings[i].stringargs[0]);
 			break;
 		}
 		case 762: //PolyObject spawn point (crush)
@@ -6883,9 +6862,8 @@ static void P_ConvertBinaryThingTypes(void)
 				mapthings[i].args[8] |= TMM_ALWAYSTHINK;
 			if (mapthings[i].type == 1110)
 			{
-				P_WriteDuplicateText(sides[lines[j].sidenum[0]].text, &mapthings[i].stringargs[0]);
-				if (lines[j].backsector)
-					P_WriteDuplicateText(sides[lines[j].sidenum[1]].text, &mapthings[i].stringargs[1]);
+				P_WriteDuplicateText(lines[j].stringargs[0], &mapthings[i].stringargs[0]);
+				P_WriteDuplicateText(lines[j].stringargs[1], &mapthings[i].stringargs[1]);
 			}
 			break;
 		}
diff --git a/src/r_defs.h b/src/r_defs.h
index 6f8049dc8..634928a59 100644
--- a/src/r_defs.h
+++ b/src/r_defs.h
@@ -612,7 +612,6 @@ struct line_t
 
 	boolean tripwire;
 
-	char *text; // a concatenation of all front and back texture names, for linedef specials that require a string.
 	INT16 callcount; // no. of calls left before triggering, for the "X calls" linedef specials, defaults to 0
 
 	// UDMF user-defined custom properties.
@@ -640,8 +639,6 @@ struct side_t
 	INT16 special; // the special of the linedef this side belongs to
 	INT16 repeatcnt; // # of times to repeat midtexture
 
-	char *text; // a concatenation of all top, bottom, and mid texture names, for linedef specials that require a string.
-
 	extracolormap_t *colormap_data; // storage for colormaps; not applied to sectors.
 
 	// UDMF user-defined custom properties.

From 459e3684aba1616d87fb37f8fd1e88b3a8268fe8 Mon Sep 17 00:00:00 2001
From: toaster <rollerorbital@gmail.com>
Date: Sat, 15 Jul 2023 19:18:39 +0100
Subject: [PATCH 06/12] P_GetNodeType: Do not dereference invalid pointer for
 **nodedata parameter

---
 src/p_setup.c | 52 ++++++++++++++++++++++++++++++++++++---------------
 1 file changed, 37 insertions(+), 15 deletions(-)

diff --git a/src/p_setup.c b/src/p_setup.c
index 16ed24b9e..1317f6f0b 100644
--- a/src/p_setup.c
+++ b/src/p_setup.c
@@ -3572,10 +3572,17 @@ static nodetype_t P_GetNodetype(const virtres_t *virt, UINT8 **nodedata)
 	nodetype_t nodetype = NT_UNSUPPORTED;
 	char signature[4 + 1];
 
+	*nodedata = NULL;
+
 	if (udmf)
 	{
-		*nodedata = vres_Find(virt, "ZNODES")->data;
-		supported[NT_XGLN] = supported[NT_XGL3] = true;
+		virtlump_t *virtznodes = vres_Find(virt, "ZNODES");
+
+		if (virtznodes && virtznodes->size)
+		{
+			*nodedata = virtznodes->data;
+			supported[NT_XGLN] = supported[NT_XGL3] = true;
+		}
 	}
 	else
 	{
@@ -3584,24 +3591,39 @@ static nodetype_t P_GetNodetype(const virtres_t *virt, UINT8 **nodedata)
 
 		if (virtsegs && virtsegs->size)
 		{
-			*nodedata = vres_Find(virt, "NODES")->data;
-			return NT_DOOM; // Traditional map format BSP tree.
-		}
-
-		virtssectors = vres_Find(virt, "SSECTORS");
-
-		if (virtssectors && virtssectors->size)
-		{ // Possibly GL nodes: NODES ignored, SSECTORS takes precedence as nodes lump, (It is confusing yeah) and has a signature.
-			*nodedata = virtssectors->data;
-			supported[NT_XGLN] = supported[NT_ZGLN] = supported[NT_XGL3] = true;
+			virtlump_t *virtnodes = vres_Find(virt, "NODES");
+			if (virtnodes && virtnodes->size)
+			{
+				*nodedata = virtnodes->data;
+				return NT_DOOM; // Traditional map format BSP tree.
+			}
 		}
 		else
-		{ // Possibly ZDoom extended nodes: SSECTORS is empty, NODES has a signature.
-			*nodedata = vres_Find(virt, "NODES")->data;
-			supported[NT_XNOD] = supported[NT_ZNOD] = true;
+		{
+			virtssectors = vres_Find(virt, "SSECTORS");
+
+			if (virtssectors && virtssectors->size)
+			{ // Possibly GL nodes: NODES ignored, SSECTORS takes precedence as nodes lump, (It is confusing yeah) and has a signature.
+				*nodedata = virtssectors->data;
+				supported[NT_XGLN] = supported[NT_ZGLN] = supported[NT_XGL3] = true;
+			}
+			else
+			{ // Possibly ZDoom extended nodes: SSECTORS is empty, NODES has a signature.
+				virtlump_t *virtnodes = vres_Find(virt, "NODES");
+				if (virtnodes && virtnodes->size)
+				{
+					*nodedata = virtnodes->data;
+					supported[NT_XNOD] = supported[NT_ZNOD] = true;
+				}
+			}
 		}
 	}
 
+	if (*nodedata == NULL)
+	{
+		I_Error("Level has no nodes (does your map have at least 2 sectors?)");
+	}
+
 	M_Memcpy(signature, *nodedata, 4);
 	signature[4] = '\0';
 	(*nodedata) += 4;

From 25f48fd26fd55d0e924595b49591e16fb9ee979c Mon Sep 17 00:00:00 2001
From: toaster <rollerorbital@gmail.com>
Date: Sat, 15 Jul 2023 20:08:53 +0100
Subject: [PATCH 07/12] Add ML_BLOCKMONSTERS to P_WriteTextmap

---
 src/p_setup.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/p_setup.c b/src/p_setup.c
index 1317f6f0b..b92c18a4c 100644
--- a/src/p_setup.c
+++ b/src/p_setup.c
@@ -2557,6 +2557,8 @@ static void P_WriteTextmap(void)
 			fprintf(f, "blocking = true;\n");
 		if (wlines[i].flags & ML_BLOCKPLAYERS)
 			fprintf(f, "blockplayers = true;\n");
+		if (wlines[i].flags & ML_BLOCKMONSTERS)
+			fprintf(f, "blockmonsters = true;\n");
 		if (wlines[i].flags & ML_TWOSIDED)
 			fprintf(f, "twosided = true;\n");
 		if (wlines[i].flags & ML_DONTPEGTOP)

From 034fa4b0a948e12034ca7b3128ae189eb11ce5f1 Mon Sep 17 00:00:00 2001
From: toaster <rollerorbital@gmail.com>
Date: Sat, 15 Jul 2023 22:50:53 +0100
Subject: [PATCH 08/12] Water Palace Turbine UDMF conversion

Requires changes in the script to support which I am not awake enough to finalise or make compatible with other branches. This took far longer than appropriate.
---
 src/p_setup.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)

diff --git a/src/p_setup.c b/src/p_setup.c
index b92c18a4c..395c34536 100644
--- a/src/p_setup.c
+++ b/src/p_setup.c
@@ -7145,6 +7145,55 @@ static void P_ConvertBinaryThingTypes(void)
 		case 3786: // MT_BATTLEUFO_SPAWNER
 			mapthings[i].args[0] = mapthings[i].angle;
 			break;
+		case 3400: // MT_WATERPALACETURBINE (TODO: not yet hardcoded)
+		{
+			mtag_t tag = (mtag_t)mapthings[i].angle;
+			INT32 j = Tag_FindLineSpecial(2009, tag);
+
+			if (j == -1)
+			{
+				CONS_Debug(DBG_GAMELOGIC, "Water Palace Turbine setup: Unable to find parameter line 2009 (tag %d)!\n", tag);
+				break;
+			}
+
+			if (!lines[j].backsector)
+			{
+				CONS_Debug(DBG_GAMELOGIC, "Water Palace Turbine setup: No backside for parameter line 2009 (tag %d)!\n", tag);
+				break;
+			}
+
+			mapthings[i].angle = sides[lines[j].sidenum[0]].rowoffset >> FRACBITS;
+
+			if (mapthings[i].options & MTF_EXTRA)
+				mapthings[i].args[0] = 1;
+			if (mapthings[i].options & MTF_OBJECTSPECIAL)
+				mapthings[i].args[1] = 1;
+
+			mapthings[i].args[2] = lines[j].frontsector->floorheight >> FRACBITS;
+			mapthings[i].args[3] = lines[j].frontsector->ceilingheight >> FRACBITS;
+
+			mapthings[i].args[4] = lines[j].backsector->floorheight >> FRACBITS;
+
+			mapthings[i].args[5] = sides[lines[j].sidenum[0]].textureoffset >> FRACBITS;
+			if (mapthings[i].args[5] < 0)
+				mapthings[i].args[5] = -mapthings[i].args[5];
+
+			mapthings[i].args[6] = sides[lines[j].sidenum[1]].rowoffset >> FRACBITS;
+			if (mapthings[i].args[6] < 0)
+				mapthings[i].args[6] = -mapthings[i].args[6];
+
+			mapthings[i].args[7] = sides[lines[j].sidenum[1]].textureoffset >> FRACBITS;
+			if (mapthings[i].args[7] < 0)
+				mapthings[i].args[7] = -mapthings[i].args[7];
+
+			if (lines[j].flags & ML_SKEWTD)
+				mapthings[i].args[8] = R_PointToDist2(lines[j].v2->x, lines[j].v2->y, lines[j].v1->x, lines[j].v1->y) >> FRACBITS;
+
+			if (lines[j].flags & ML_NOSKEW)
+				mapthings[i].args[9] = 1;
+
+			break;
+		}
 		case 3441: // MT_DASHRING (TODO: not yet hardcoded)
 		case 3442: // MT_RAINBOWDASHRING (TODO: not yet hardcoded)
 			mapthings[i].args[0] = mapthings[i].options & 13;

From c1810ac89178d1993c0f5bc08dce56611bb3b1c7 Mon Sep 17 00:00:00 2001
From: toaster <rollerorbital@gmail.com>
Date: Tue, 18 Jul 2023 10:59:06 +0100
Subject: [PATCH 09/12] P_SetupSpawnedMapThing: Re-add missing MT_AMBIENT

---
 src/p_mobj.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/p_mobj.c b/src/p_mobj.c
index d927090fb..d692fb4fd 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -13131,6 +13131,11 @@ static boolean P_SetupSpawnedMapThing(mapthing_t *mthing, mobj_t *mobj)
 			mobj->flags2 |= MF2_AMBUSH;
 		}
 		break;
+	case MT_AMBIENT:
+		if (mthing->stringargs[0])
+			mobj->threshold = get_number(mthing->stringargs[0]);
+		mobj->health = mthing->args[0] ? mthing->args[0] : TICRATE;
+		break;
 	// SRB2Kart
 	case MT_WAYPOINT:
 	{

From c404e704c249a3af4c774d67e89de3be13be1b96 Mon Sep 17 00:00:00 2001
From: toaster <rollerorbital@gmail.com>
Date: Wed, 19 Jul 2023 22:54:05 +0100
Subject: [PATCH 10/12] Linedef type 460: ACTUALLY don't push your rings below
 baseline

---
 src/p_spec.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/p_spec.c b/src/p_spec.c
index 0a8f74b15..8c7ef332a 100644
--- a/src/p_spec.c
+++ b/src/p_spec.c
@@ -4199,10 +4199,13 @@ boolean P_ProcessSpecial(activator_t *activator, INT16 special, INT32 *args, cha
 					else
 					{
 						// Don't push you below baseline
-						if (mo->player->rings < 0)
+						if (mo->player->rings <= 0)
 							return false;
 
-						mo->player->rings--;
+						if (rings > mo->player->rings)
+							rings = mo->player->rings;
+
+						mo->player->rings -= rings;
 						S_StartSound(mo, sfx_antiri);
 					}
 				}

From 63450740ba73bfb273a465456ce7247306d86dfa Mon Sep 17 00:00:00 2001
From: toaster <rollerorbital@gmail.com>
Date: Wed, 19 Jul 2023 22:54:20 +0100
Subject: [PATCH 11/12] Linedef type 460: Don't do anything in Spheres
 gametypes

---
 src/p_spec.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/p_spec.c b/src/p_spec.c
index 8c7ef332a..81ec88f15 100644
--- a/src/p_spec.c
+++ b/src/p_spec.c
@@ -4179,6 +4179,9 @@ boolean P_ProcessSpecial(activator_t *activator, INT16 special, INT32 *args, cha
 
 		case 460: // Award rings
 			{
+				if (gametyperules & GTR_SPHERES)
+					return false;
+
 				INT16 rings = args[0];
 				INT32 delay = args[1];
 				if (

From b4bd8f428d3cb484be6e50b59dc1279308e29a40 Mon Sep 17 00:00:00 2001
From: toaster <rollerorbital@gmail.com>
Date: Fri, 21 Jul 2023 16:20:25 +0100
Subject: [PATCH 12/12] Permit lowercase enum grabs for sounds in get_number
 outside of Lua

A different solution to the issue reported on the SRB2 port of this branch. We don't care quite as much about exact game behaviour, so this permits lowercase sound effects (same as the source code) in maps' stringargs.
---
 src/deh_lua.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/deh_lua.c b/src/deh_lua.c
index 6309859bd..7b9555104 100644
--- a/src/deh_lua.c
+++ b/src/deh_lua.c
@@ -493,7 +493,7 @@ static inline int lib_getenum(lua_State *L)
 		if (mathlib) return luaL_error(L, "player sprite '%s' could not be found.\n", word);
 		return 0;
 	}
-	else if (!mathlib && fastncmp("sfx_",word,4)) {
+	else if (fastncmp("sfx_",word,4)) {
 		p = word+4;
 		for (i = 0; i < NUMSFX; i++)
 			if (S_sfx[i].name && fastcmp(p, S_sfx[i].name)) {