From 36decf14e7c5cae73e797522a7aa4a406191ada3 Mon Sep 17 00:00:00 2001
From: NepDisk <nepdisk@noreply.codeberg.org>
Date: Wed, 19 Nov 2025 16:42:23 -0500
Subject: [PATCH] Toggle to decide to include mappatch objects in textmap
 conversion for UDMF and Binary

---
 src/k_kart.c  |  2 ++
 src/p_setup.c | 16 ++++++++++++++--
 src/p_setup.h |  2 ++
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/src/k_kart.c b/src/k_kart.c
index 0e7403fd4..179746553 100644
--- a/src/k_kart.c
+++ b/src/k_kart.c
@@ -420,6 +420,8 @@ void K_RegisterKartStuff(void)
 
 	CV_RegisterVar(&cv_kartexplosion_limitlifetime);
 	CV_RegisterVar(&cv_kartexplosion_limitlifetime_cap);
+
+	CV_RegisterVar(&cv_writetextmap_includemappatch);
 }
 
 //}
diff --git a/src/p_setup.c b/src/p_setup.c
index fbf85aed9..976b0e167 100644
--- a/src/p_setup.c
+++ b/src/p_setup.c
@@ -119,6 +119,8 @@
 #include <time.h>
 #endif
 
+consvar_t cv_writetextmap_includemappatch = CVAR_INIT ("writetextmap_includemappatch", "Off", CV_SAVE, CV_OnOff, NULL);
+
 //
 // Map hash, calculated on level load.
 // Sent to clients in PT_SERVERINFO.
@@ -8016,6 +8018,12 @@ static boolean P_LoadMapFromFile(void)
 
 	P_MakeMapHash(curmapvirt, &maphash);
 
+	if (!cv_writetextmap_includemappatch.value)
+	{
+		if (M_CheckParm("-writetextmap"))
+			P_WriteTextmap();
+	}
+
 	// load map patch?
 	char *patchdata = NULL;
 	size_t patchlen;
@@ -8039,8 +8047,12 @@ static boolean P_LoadMapFromFile(void)
 	else
 		P_RemapDoomedNum(true);
 
-	if (M_CheckParm("-writetextmap"))
-		P_WriteTextmap();
+
+	if (cv_writetextmap_includemappatch.value)
+	{
+		if (M_CheckParm("-writetextmap"))
+			P_WriteTextmap();
+	}
 
 	Z_Free(patchdata);
 
diff --git a/src/p_setup.h b/src/p_setup.h
index e04ff868d..e09f467fa 100644
--- a/src/p_setup.h
+++ b/src/p_setup.h
@@ -27,6 +27,8 @@ extern "C" {
 // map hash, sent to players via PT_SERVERINFO
 extern UINT64 maphash;
 
+extern consvar_t cv_writetextmap_includemappatch;
+
 // Player spawn spots for deathmatch.
 #define MAX_DM_STARTS 64
 extern mapthing_t *deathmatchstarts[MAX_DM_STARTS];