From bfb83abbc2eee0d8473be45243b515307599baf4 Mon Sep 17 00:00:00 2001
From: nashmuhandes <nashbackslash@gmail.com>
Date: Thu, 22 Apr 2021 02:12:44 +0800
Subject: [PATCH] Default Heretic's, Hexen's and Strife's default screen wipe
 styles to match their original counterparts.

---
 src/gameconfigfile.cpp | 16 ++++++++++++++++
 src/gameconfigfile.h   |  1 +
 2 files changed, 17 insertions(+)

diff --git a/src/gameconfigfile.cpp b/src/gameconfigfile.cpp
index bdf26e3545..76bf0fc4cf 100644
--- a/src/gameconfigfile.cpp
+++ b/src/gameconfigfile.cpp
@@ -72,6 +72,7 @@ EXTERN_CVAR(Float, m_sensitivity_x)
 EXTERN_CVAR(Float, m_sensitivity_y)
 EXTERN_CVAR(Int, adl_volume_model)
 EXTERN_CVAR (Int, gl_texture_hqresize_targets)
+EXTERN_CVAR(Int, wipetype)
 
 #ifdef _WIN32
 EXTERN_CVAR(Int, in_mouse)
@@ -622,6 +623,11 @@ void FGameConfigFile::DoGameSetup (const char *gamename)
 		SetRavenDefaults (gameinfo.gametype == GAME_Hexen);
 	}
 
+	if (gameinfo.gametype & GAME_Strife)
+	{
+		SetStrifeDefaults ();
+	}
+
 	// The NetServerInfo section will be read and override anything loaded
 	// here when it's determined that a netgame is being played.
 	strncpy (subsection, "LocalServerInfo", sublen);
@@ -923,6 +929,9 @@ void FGameConfigFile::SetRavenDefaults (bool isHexen)
 	val.Int = 0x734323;
 	am_cdwallcolor.SetGenericRepDefault (val, CVAR_Int);
 
+	val.Int = 0;
+	wipetype.SetGenericRepDefault(val, CVAR_Int);
+
 	// Fix the Heretic/Hexen automap colors so they are correct.
 	// (They were wrong on older versions.)
 	if (*am_wallcolor == 0x2c1808 && *am_fdwallcolor == 0x887058 && *am_cdwallcolor == 0x4c3820)
@@ -939,6 +948,13 @@ void FGameConfigFile::SetRavenDefaults (bool isHexen)
 	}
 }
 
+void FGameConfigFile::SetStrifeDefaults ()
+{
+	UCVarValue val;
+	val.Int = 3;
+	wipetype.SetGenericRepDefault(val, CVAR_Int);
+}
+
 CCMD (whereisini)
 {
 	FString path = M_GetConfigPath(false);
diff --git a/src/gameconfigfile.h b/src/gameconfigfile.h
index 88f5fe30e4..023277ae7b 100644
--- a/src/gameconfigfile.h
+++ b/src/gameconfigfile.h
@@ -63,6 +63,7 @@ protected:
 
 private:
 	void SetRavenDefaults (bool isHexen);
+	void SetStrifeDefaults ();
 	void ReadCVars (unsigned flags);
 
 	bool bModSetup;