From 20c73e124987773f48d39d92003a15ee10d662f6 Mon Sep 17 00:00:00 2001
From: Mitchell Richters <mjr4077au@gmail.com>
Date: Wed, 16 Sep 2020 10:34:53 +1000
Subject: [PATCH] - Blood: Remove `r_horizcenter` and standardise horizon in
 game to that of the default in the backend (currently 100).

* The use of this will go when the input is re-factored to operate on the standard horizon of 100, not 0.
---
 source/blood/src/hudsprites.cpp | 2 +-
 source/blood/src/view.cpp       | 9 ++-------
 source/blood/src/view.h         | 2 +-
 source/core/gamecvars.cpp       | 2 --
 source/core/gamecvars.h         | 1 -
 5 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/source/blood/src/hudsprites.cpp b/source/blood/src/hudsprites.cpp
index 130c2f1a4..e969c1323 100644
--- a/source/blood/src/hudsprites.cpp
+++ b/source/blood/src/hudsprites.cpp
@@ -96,7 +96,7 @@ static void viewBurnTime(int gScale)
 }
 
 
-void hudDraw(PLAYER *gView, int nSectnum, int defaultHoriz, double bobx, double boby, double zDelta, int basepal, int smoothratio)
+void hudDraw(PLAYER *gView, int nSectnum, double bobx, double boby, double zDelta, int basepal, int smoothratio)
 {
 	if (gViewPos == 0)
 	{
diff --git a/source/blood/src/view.cpp b/source/blood/src/view.cpp
index bc536fb44..8b4425325 100644
--- a/source/blood/src/view.cpp
+++ b/source/blood/src/view.cpp
@@ -74,7 +74,7 @@ INTERPOLATE gInterpolation[kMaxInterpolations];
 
 int gScreenTilt;
 
-
+int const defaultHoriz = polymostcenterhoriz;
 
 FFont *gFont[kFontNum];
 
@@ -586,7 +586,6 @@ static void DrawMap(spritetype* pSprite)
 void viewDrawScreen(bool sceneonly)
 {
     int nPalette = 0;
-    int defaultHoriz = r_horizcenter ? 100 : 90;
 	
 	if (TestBitString(gotpic, 2342))
 	{
@@ -594,10 +593,6 @@ void viewDrawScreen(bool sceneonly)
 		ClearBitString(gotpic, 2342);
 	}
 
-
-#ifdef USE_OPENGL
-    polymostcenterhoriz = defaultHoriz;
-#endif
     if (!paused && (!M_Active() || gGameOptions.nGameType != 0))
     {
         gInterpolate = I_GetTimeFrac() * MaxSmoothRatio;
@@ -957,7 +952,7 @@ void viewDrawScreen(bool sceneonly)
             }
         }
 #endif
-        hudDraw(gView, nSectnum, defaultHoriz, v4c, v48, zDelta, basepal, (int)gInterpolate);
+        hudDraw(gView, nSectnum, v4c, v48, zDelta, basepal, (int)gInterpolate);
     }
     UpdateDacs(0, true);    // keep the view palette active only for the actual 3D view and its overlays.
     if (automapMode != am_off)
diff --git a/source/blood/src/view.h b/source/blood/src/view.h
index f987e278e..0cba77c2a 100644
--- a/source/blood/src/view.h
+++ b/source/blood/src/view.h
@@ -140,7 +140,7 @@ extern LOCATION gPrevSpriteLoc[kMaxSprites];
 extern int gLastPal;
 extern double gInterpolate;
 
-void hudDraw(PLAYER* gView, int nSectnum, int defaultHoriz, double bobx, double boby, double zDelta, int basepal, int smoothratio);
+void hudDraw(PLAYER* gView, int nSectnum, double bobx, double boby, double zDelta, int basepal, int smoothratio);
 void viewInitializePrediction(void);
 void viewUpdatePrediction(InputPacket *pInput);
 void viewCorrectPrediction(void);
diff --git a/source/core/gamecvars.cpp b/source/core/gamecvars.cpp
index a8951b08a..c7c4548f7 100644
--- a/source/core/gamecvars.cpp
+++ b/source/core/gamecvars.cpp
@@ -207,8 +207,6 @@ CUSTOM_CVARD(Int, r_fov, 90, CVAR_ARCHIVE|CVAR_GLOBALCONFIG, "change the field o
 	else if (self > 140) self = 140;
 }
 
-CVARD(Bool, r_horizcenter, false, CVAR_ARCHIVE, "enable/disable centered horizon line") // only present in Blood.
-
 CVARD(Bool, in_mousemode, true, CVAR_ARCHIVE|CVAR_GLOBALCONFIG, "toggles vertical mouse view")
 
 CVAR(Bool, silentmouseaimtoggle, false, CVAR_ARCHIVE|CVAR_GLOBALCONFIG)
diff --git a/source/core/gamecvars.h b/source/core/gamecvars.h
index ae8dc6ccc..bcc11b94d 100644
--- a/source/core/gamecvars.h
+++ b/source/core/gamecvars.h
@@ -71,7 +71,6 @@ EXTERN_CVAR(Bool, am_nameontop)
 
 
 EXTERN_CVAR(Int, r_fov)
-EXTERN_CVAR(Bool, r_horizcenter)
 EXTERN_CVAR(Int, r_drawweapon)
 EXTERN_CVAR(Int, r_showfps)
 EXTERN_CVAR(Int, r_showfpsperiod)