From 326da6d495b0499e6cda5ed41e7f344b3d3f4032 Mon Sep 17 00:00:00 2001
From: Mitchell Richters <mjr4077au@gmail.com>
Date: Sat, 10 Sep 2022 22:22:22 +1000
Subject: [PATCH] - Blood: Eliminate `VIEW::horiz` and `VIEW::horizoff`.

---
 source/games/blood/src/osdcmd.cpp | 5 ++---
 source/games/blood/src/view.cpp   | 2 --
 source/games/blood/src/view.h     | 2 --
 3 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/source/games/blood/src/osdcmd.cpp b/source/games/blood/src/osdcmd.cpp
index 0e400500f..f8becb051 100644
--- a/source/games/blood/src/osdcmd.cpp
+++ b/source/games/blood/src/osdcmd.cpp
@@ -34,19 +34,18 @@ BEGIN_BLD_NS
 void GameInterface::WarpToCoords(double x, double y, double z, DAngle ang, int horz)
 {
 	PLAYER* pPlayer = &gPlayer[myconnectindex];
-	VIEW* pView = &gPrevView[myconnectindex];
 
 	pPlayer->actor->opos.XY() = pPlayer->actor->spr.pos.XY() = { x , y };
 	pPlayer->ozView = pPlayer->zView = z;
 
 	if (ang != DAngle::fromDeg(INT_MIN))
 	{
-		pPlayer->angle.oang = pPlayer->angle.ang = gView->angle.ang = ang;
+		pPlayer->angle.oang = pPlayer->angle.ang = ang;
 	}
 
 	if (horz != INT_MIN)
 	{
-		pPlayer->horizon.ohoriz = pPlayer->horizon.horiz = pView->horiz = gView->horizon.horiz = buildhoriz(horz);
+		pPlayer->horizon.ohoriz = pPlayer->horizon.horiz = buildhoriz(horz);
 	}
 }
 
diff --git a/source/games/blood/src/view.cpp b/source/games/blood/src/view.cpp
index fa6f497b6..5cbaa4668 100644
--- a/source/games/blood/src/view.cpp
+++ b/source/games/blood/src/view.cpp
@@ -63,8 +63,6 @@ void viewBackupView(int nPlayer)
 	VIEW* pView = &gPrevView[nPlayer];
 	pPlayer->ozView = pPlayer->zView;
 	pPlayer->ozWeapon = pPlayer->zWeapon - pPlayer->zView - 0xc00;
-	pView->horiz = pPlayer->horizon.horiz;
-	pView->horizoff = pPlayer->horizon.horizoff;
 	pView->slope = pPlayer->slope;
 	pView->bobHeight = pPlayer->bobHeight;
 	pView->bobWidth = pPlayer->bobWidth;
diff --git a/source/games/blood/src/view.h b/source/games/blood/src/view.h
index 5b6551fb2..d28c11fdf 100644
--- a/source/games/blood/src/view.h
+++ b/source/games/blood/src/view.h
@@ -40,8 +40,6 @@ struct VIEW {
 	int swayAmp;
 	int shakeBobY; // bob sway y
 	int shakeBobX; // bob sway x
-	fixedhoriz horiz; // horiz
-	fixedhoriz horizoff; // horizoff
 	int slope;
 	int zViewVel;
 	int zWeapon;