From 0ab690bc60f0b07bb1413d90eefbefaecb442757 Mon Sep 17 00:00:00 2001
From: fickleheart <fickle@tinted.red>
Date: Fri, 1 Feb 2019 19:28:05 -0600
Subject: [PATCH] Draw player names in netreplays

---
 src/st_stuff.c | 38 +++++++++++++++++++++++++++++++-------
 src/v_video.c  |  8 +++++++-
 src/v_video.h  |  1 +
 3 files changed, 39 insertions(+), 8 deletions(-)

diff --git a/src/st_stuff.c b/src/st_stuff.c
index 8ebd2132..c4947891 100644
--- a/src/st_stuff.c
+++ b/src/st_stuff.c
@@ -1894,15 +1894,39 @@ static void ST_overlayDrawer(void)
 			V_DrawScaledPatch(hudinfo[HUD_GRAVBOOTSICO].x, STRINGY(hudinfo[HUD_GRAVBOOTSICO].y), V_SNAPTORIGHT, gravboots);
 		*/
 
-		if(!P_IsLocalPlayer(stplyr))
+		if (!(multiplayer && demoplayback))
 		{
-			/*char name[MAXPLAYERNAME+1];
-			// shorten the name if its more than twelve characters.
-			strlcpy(name, player_names[stplyr-players], 13);*/
+			if(!P_IsLocalPlayer(stplyr))
+			{
+				/*char name[MAXPLAYERNAME+1];
+				// shorten the name if its more than twelve characters.
+				strlcpy(name, player_names[stplyr-players], 13);*/
 
-			// Show name of player being displayed
-			V_DrawCenteredString((BASEVIDWIDTH/2), BASEVIDHEIGHT-40, 0, M_GetText("Viewpoint:"));
-			V_DrawCenteredString((BASEVIDWIDTH/2), BASEVIDHEIGHT-32, V_ALLOWLOWERCASE, player_names[stplyr-players]);
+				// Show name of player being displayed
+				V_DrawCenteredString((BASEVIDWIDTH/2), BASEVIDHEIGHT-40, 0, M_GetText("Viewpoint:"));
+				V_DrawCenteredString((BASEVIDWIDTH/2), BASEVIDHEIGHT-32, V_ALLOWLOWERCASE, player_names[stplyr-players]);
+			}
+		}
+		else
+		{
+
+			if (!splitscreen)
+			{
+				V_DrawCenteredString((BASEVIDWIDTH/2), BASEVIDHEIGHT-40, V_HUDTRANSHALF, M_GetText("Viewpoint:"));
+				V_DrawCenteredString((BASEVIDWIDTH/2), BASEVIDHEIGHT-32, V_HUDTRANSHALF|V_ALLOWLOWERCASE, player_names[stplyr-players]);
+			}
+			else if (splitscreen == 1)
+			{
+				char name[MAXPLAYERNAME+12];
+				sprintf(name, "VIEWPOINT: %s", player_names[stplyr-players]);
+
+				INT32 y = (stplyr == &players[displayplayer]) ? 8 : BASEVIDHEIGHT/2-16;
+				V_DrawRightAlignedThinString(BASEVIDWIDTH-40, y, V_HUDTRANSHALF|V_ALLOWLOWERCASE|K_calcSplitFlags(V_SNAPTOTOP|V_SNAPTOBOTTOM|V_SNAPTORIGHT), name);
+			}
+			else if (splitscreen)
+			{
+				V_DrawCenteredThinString(BASEVIDWIDTH/4, 4, V_HUDTRANSHALF|V_ALLOWLOWERCASE|K_calcSplitFlags(V_SNAPTOTOP), player_names[stplyr-players]);
+			}
 		}
 
 		// This is where we draw all the fun cheese if you have the chasecam off!
diff --git a/src/v_video.c b/src/v_video.c
index dd95efe3..2a16ee47 100644
--- a/src/v_video.c
+++ b/src/v_video.c
@@ -1872,6 +1872,12 @@ void V_DrawThinString(INT32 x, INT32 y, INT32 option, const char *string)
 	}
 }
 
+void V_DrawCenteredThinString(INT32 x, INT32 y, INT32 option, const char *string)
+{
+	x -= V_ThinStringWidth(string, option)/2;
+	V_DrawThinString(x, y, option, string);
+}
+
 void V_DrawRightAlignedThinString(INT32 x, INT32 y, INT32 option, const char *string)
 {
 	x -= V_ThinStringWidth(string, option);
@@ -2305,7 +2311,7 @@ INT32 V_ThinStringWidth(const char *string, INT32 option)
 		}
 	}
 
-	
+
 	return w;
 }
 
diff --git a/src/v_video.h b/src/v_video.h
index 4a904f79..bc2549d9 100644
--- a/src/v_video.h
+++ b/src/v_video.h
@@ -182,6 +182,7 @@ void V_DrawRightAlignedSmallString(INT32 x, INT32 y, INT32 option, const char *s
 
 // draw a string using the tny_font
 void V_DrawThinString(INT32 x, INT32 y, INT32 option, const char *string);
+void V_DrawCenteredThinString(INT32 x, INT32 y, INT32 option, const char *string);
 void V_DrawRightAlignedThinString(INT32 x, INT32 y, INT32 option, const char *string);
 
 void V_DrawStringAtFixed(fixed_t x, fixed_t y, INT32 option, const char *string);