From 4387455d9c8fd551d151c66d598430033573a691 Mon Sep 17 00:00:00 2001
From: ZTsukei <ztsukei@gmail.com>
Date: Tue, 17 Oct 2017 18:23:36 -0400
Subject: [PATCH] Fixing post-map name being weird

---
 src/doomdef.h | 10 +++++-----
 src/p_spec.c  |  2 +-
 src/y_inter.c | 34 +++++++++++++++++++++++++---------
 3 files changed, 31 insertions(+), 15 deletions(-)

diff --git a/src/doomdef.h b/src/doomdef.h
index 53442ac2..83d3634e 100644
--- a/src/doomdef.h
+++ b/src/doomdef.h
@@ -143,16 +143,16 @@ extern FILE *logstream;
 #define DEVELOP // Disable this for release builds to remove excessive cheat commands and enable MD5 checking and stuff, all in one go. :3
 #ifdef DEVELOP
 #define VERSION    104 // Game version
-#define SUBVERSION 7 // more precise version number
+#define SUBVERSION 8 // more precise version number
 #define VERSIONSTRING "Development EXE"
-#define VERSIONSTRINGW "v1.4.7"
+#define VERSIONSTRINGW "v1.4.8"
 // most interface strings are ignored in development mode.
 // we use comprevision and compbranch instead.
 #else
 #define VERSION    104 // Game version
-#define SUBVERSION 7 // more precise version number
-#define VERSIONSTRING "DevEXE v1.4.7"
-#define VERSIONSTRINGW L"v1.4.7"
+#define SUBVERSION 8 // more precise version number
+#define VERSIONSTRING "DevEXE v1.4.8"
+#define VERSIONSTRINGW L"v1.4.8"
 // Hey! If you change this, add 1 to the MODVERSION below!
 // Otherwise we can't force updates!
 #endif
diff --git a/src/p_spec.c b/src/p_spec.c
index 3f9ad146..646b88e2 100644
--- a/src/p_spec.c
+++ b/src/p_spec.c
@@ -4632,7 +4632,7 @@ static void P_RunSpecialSectorCheck(player_t *player, sector_t *sector)
 	// Check Section 1
 	switch(GETSECSPECIAL(sector->special, 1))
 	{
-		case 2: // Damage (water)
+		//case 2: // Damage (water)
 		case 8: // Instant kill
 		case 10: // Ring drainer that doesn't require floor touch
 		case 12: // Space countdown
diff --git a/src/y_inter.c b/src/y_inter.c
index c23cf735..8b845993 100644
--- a/src/y_inter.c
+++ b/src/y_inter.c
@@ -1290,16 +1290,32 @@ void Y_StartIntermission(void)
 			Y_CalculateTournamentPoints();
 
 			// set up the levelstring
-			if (mapheaderinfo[prevmap]->actnum)
-				snprintf(data.match.levelstring,
-					sizeof data.match.levelstring,
-					"%.32s * %d *",
-					mapheaderinfo[prevmap]->lvlttl, mapheaderinfo[prevmap]->actnum);
+			if (mapheaderinfo[prevmap]->zonttl)
+			{
+				if (mapheaderinfo[prevmap]->actnum)
+					snprintf(data.match.levelstring,
+						sizeof data.match.levelstring,
+						"%.32s %.32s * %d *",
+						mapheaderinfo[prevmap]->lvlttl, mapheaderinfo[prevmap]->zonttl, mapheaderinfo[prevmap]->actnum);
+				else
+					snprintf(data.match.levelstring,
+						sizeof data.match.levelstring,
+						"* %.32s %.32s *",
+						mapheaderinfo[prevmap]->lvlttl, mapheaderinfo[prevmap]->zonttl);
+			}
 			else
-				snprintf(data.match.levelstring,
-					sizeof data.match.levelstring,
-					"* %.32s *",
-					mapheaderinfo[prevmap]->lvlttl);
+			{
+				if (mapheaderinfo[prevmap]->actnum)
+					snprintf(data.match.levelstring,
+						sizeof data.match.levelstring,
+						"%.32s * %d *",
+						mapheaderinfo[prevmap]->lvlttl, mapheaderinfo[prevmap]->actnum);
+				else
+					snprintf(data.match.levelstring,
+						sizeof data.match.levelstring,
+						"* %.32s *",
+						mapheaderinfo[prevmap]->lvlttl);
+			}
 
 			data.match.levelstring[sizeof data.match.levelstring - 1] = '\0';