From e2e176e0be1d284c09853116a5728a9c06311c4d Mon Sep 17 00:00:00 2001
From: Rachael Alexanderson <madame-rachelle@users.noreply.github.com>
Date: Wed, 30 Sep 2020 01:05:37 -0400
Subject: [PATCH] - remove old 'mouse_sensitivity' cvar completely, it's no
 longer needed - update defcvars parser so it no longer looks for it

---
 src/console/c_cmds.cpp |  1 -
 src/d_main.cpp         | 11 +++++++++--
 src/doomstat.h         |  1 -
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/console/c_cmds.cpp b/src/console/c_cmds.cpp
index 503336b82..fb96b553a 100644
--- a/src/console/c_cmds.cpp
+++ b/src/console/c_cmds.cpp
@@ -77,7 +77,6 @@ CVAR (Bool, sv_cheats, false, CVAR_SERVERINFO | CVAR_LATCH)
 CVAR (Bool, sv_unlimited_pickup, false, CVAR_SERVERINFO)
 CVAR (Int, cl_blockcheats, 0, 0)
 
-CVAR(Float, mouse_sensitivity, 1.f, CVAR_ARCHIVE | CVAR_GLOBALCONFIG)
 CVAR(Bool, show_messages, true, CVAR_ARCHIVE | CVAR_GLOBALCONFIG)
 CVAR(Bool, show_obituaries, true, CVAR_ARCHIVE)
 
diff --git a/src/d_main.cpp b/src/d_main.cpp
index 8f27a9d56..fbd3a8931 100644
--- a/src/d_main.cpp
+++ b/src/d_main.cpp
@@ -366,7 +366,6 @@ void D_GrabCVarDefaults()
 			}
 
 			CurrentFindCVar = sc.String;
-
 			if (lumpversion < 220)
 			{
 				CurrentFindCVar.ToLower();
@@ -385,9 +384,17 @@ void D_GrabCVarDefaults()
 				if (strcmp(CurrentFindCVar, "cd_drive") == 0)
 					break;
 			}
+			if (lumpversion < 221)
+			{
+				// removed cvar
+				// this one doesn't matter as much, since it depended on platform-specific values,
+				// and is something the user should change anyhow, so, let's just throw this value
+				// out.
+				if (strcmp(CurrentFindCVar, "mouse_sensitivity") == 0)
+					break;
+			}
 
 			var = FindCVar(CurrentFindCVar, NULL);
-
 			if (var != NULL)
 			{
 				if (var->GetFlags() & CVAR_ARCHIVE)
diff --git a/src/doomstat.h b/src/doomstat.h
index 873301c98..729d3fffe 100644
--- a/src/doomstat.h
+++ b/src/doomstat.h
@@ -183,7 +183,6 @@ extern	bool	 		precache;
 extern bool setsizeneeded;
 
 
-EXTERN_CVAR (Float, mouse_sensitivity)
 //?
 // debug flag to cancel adaptiveness
 extern	bool	 		singletics;