From 810e240f89d6d8512345704ded0de228df29bdfa Mon Sep 17 00:00:00 2001
From: Rachael Alexanderson <madame-rachelle@users.noreply.github.com>
Date: Tue, 21 Jul 2020 13:53:27 -0400
Subject: [PATCH] - add 'sv_alwaystally' defaults to 0 with the following
 states: * 0: previous behavior (completely MAPINFO controlled) * 1: always
 show level tally at the end of an episode * 2: always show level tally even
 when changing levels within a hub

---
 src/g_level.cpp     | 28 +++++++++++++++++++++++-----
 src/g_levellocals.h |  1 +
 2 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/src/g_level.cpp b/src/g_level.cpp
index 245d01d00..688e5388d 100644
--- a/src/g_level.cpp
+++ b/src/g_level.cpp
@@ -151,7 +151,7 @@ CUSTOM_CVAR(Int, gl_lightmode, 3, CVAR_ARCHIVE | CVAR_NOINITCALL)
 	}
 }
 
-
+CVAR(Int, sv_alwaystally, 0, CVAR_ARCHIVE | CVAR_SERVERINFO)
 
 static FRandom pr_classchoice ("RandomPlayerClassChoice");
 
@@ -580,6 +580,26 @@ static bool		unloading;
 
 EXTERN_CVAR(Bool, sv_singleplayerrespawn)
 
+bool FLevelLocals::ShouldDoIntermission(cluster_info_t* nextcluster, cluster_info_t* thiscluster)
+{
+	// this is here to remove some code duplication
+
+	if ((sv_alwaystally == 2) || (deathmatch))
+		return true;
+
+	if ((sv_alwaystally == 0) && (flags & LEVEL_NOINTERMISSION))
+		return false;
+
+	bool withinSameCluster = (nextcluster == thiscluster);
+	bool clusterIsHub = (thiscluster->flags & CLUSTER_HUB);
+	bool hubNoIntermission = !(thiscluster->flags & CLUSTER_ALLOWINTERMISSION);
+
+	if (withinSameCluster && clusterIsHub && hubNoIntermission)
+		return false;
+
+	return true;
+}
+
 void FLevelLocals::ChangeLevel(const char *levelname, int position, int inflags, int nextSkill)
 {
 	if (!isPrimaryLevel()) return;	// only the primary level may exit.
@@ -682,7 +702,7 @@ void FLevelLocals::ChangeLevel(const char *levelname, int position, int inflags,
 
 	if (thiscluster && (thiscluster->flags & CLUSTER_HUB))
 	{
-		if ((flags & LEVEL_NOINTERMISSION) || ((nextcluster == thiscluster) && !(thiscluster->flags & CLUSTER_ALLOWINTERMISSION)))
+		if (!ShouldDoIntermission(nextcluster, thiscluster))
 			NoWipe = 35;
 		D_DrawIcon = "TELEICON";
 	}
@@ -994,9 +1014,7 @@ bool FLevelLocals::DoCompleted (FString nextlevel, wbstartstruct_t &wminfo)
 
 	finishstate = mode;
 
-	if (!deathmatch &&
-		((flags & LEVEL_NOINTERMISSION) ||
-		((nextcluster == thiscluster) && (thiscluster->flags & CLUSTER_HUB) && !(thiscluster->flags & CLUSTER_ALLOWINTERMISSION))))
+	if (!ShouldDoIntermission(nextcluster, thiscluster))
 	{
 		WorldDone ();
 		return false;
diff --git a/src/g_levellocals.h b/src/g_levellocals.h
index cfde06118..7e3666100 100644
--- a/src/g_levellocals.h
+++ b/src/g_levellocals.h
@@ -150,6 +150,7 @@ struct FLevelLocals
 	void Init();
 
 private:
+	bool ShouldDoIntermission(cluster_info_t* nextcluster, cluster_info_t* thiscluster);
 	line_t *FindPortalDestination(line_t *src, int tag);
 	void BuildPortalBlockmap();
 	void UpdatePortal(FLinePortal *port);