From e17d24ce0b92ffae30bf9bd19b9442aae98fef27 Mon Sep 17 00:00:00 2001
From: Mitchell Richters <mjr4077au@gmail.com>
Date: Sat, 27 Aug 2022 19:29:58 +1000
Subject: [PATCH] - Change `FBunch::startangle` and `FBunch::endangle` from
 `binangle` to `angle_t`.

---
 .../core/rendering/scene/hw_bunchdrawer.cpp   | 24 +++++++++----------
 source/core/rendering/scene/hw_bunchdrawer.h  |  4 ++--
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/source/core/rendering/scene/hw_bunchdrawer.cpp b/source/core/rendering/scene/hw_bunchdrawer.cpp
index 259f40cfc..66ca407d1 100644
--- a/source/core/rendering/scene/hw_bunchdrawer.cpp
+++ b/source/core/rendering/scene/hw_bunchdrawer.cpp
@@ -116,11 +116,11 @@ bool BunchDrawer::StartBunch(int sectnum, int linenum, binangle startan, binangl
 
 	bunch->sectornum = sectnum;
 	bunch->startline = bunch->endline = linenum;
-	bunch->startangle = startan;
-	bunch->endangle = endan;
+	bunch->startangle = startan.asbam();
+	bunch->endangle = endan.asbam();
 	bunch->portal = portal;
-	assert(bunch->endangle.asbam() >= bunch->startangle.asbam());
-	return bunch->endangle != angrange;
+	assert(bunch->endangle >= bunch->startangle);
+	return bunch->endangle != angrange.asbam();
 }
 
 //==========================================================================
@@ -132,10 +132,10 @@ bool BunchDrawer::StartBunch(int sectnum, int linenum, binangle startan, binangl
 bool BunchDrawer::AddLineToBunch(int line, binangle newan)
 {
 	Bunches[LastBunch].endline++;
-	assert(newan.asbam() > Bunches[LastBunch].endangle.asbam());
-	Bunches[LastBunch].endangle = newan;
-	assert(Bunches[LastBunch].endangle.asbam() > Bunches[LastBunch].startangle.asbam());
-	return Bunches[LastBunch].endangle != angrange;
+	assert(newan.asbam() > Bunches[LastBunch].endangle);
+	Bunches[LastBunch].endangle = newan.asbam();
+	assert(Bunches[LastBunch].endangle > Bunches[LastBunch].startangle);
+	return Bunches[LastBunch].endangle != angrange.asbam();
 }
 
 //==========================================================================
@@ -530,10 +530,10 @@ int BunchDrawer::BunchInFront(FBunch* b1, FBunch* b2)
 	binangle anglecheck, endang;
 	bool colinear = false;
 
-	if (b2->startangle.asbam() >= b1->startangle.asbam() && b2->startangle.asbam() < b1->endangle.asbam())
+	if (b2->startangle >= b1->startangle && b2->startangle < b1->endangle)
 	{
 		// we have an overlap at b2->startangle
-		anglecheck = b2->startangle;
+		anglecheck = bamang(b2->startangle);
 
 		// Find the wall in b1 that overlaps b2->startangle
 		for (int i = b1->startline; i <= b1->endline; i++)
@@ -556,10 +556,10 @@ int BunchDrawer::BunchInFront(FBunch* b1, FBunch* b2)
 			}
 		}
 	}
-	else if (b1->startangle.asbam() >= b2->startangle.asbam() && b1->startangle.asbam() < b2->endangle.asbam())
+	else if (b1->startangle >= b2->startangle && b1->startangle < b2->endangle)
 	{
 		// we have an overlap at b1->startangle
-		anglecheck = b1->startangle;
+		anglecheck = bamang(b1->startangle);
 
 		// Find the wall in b2 that overlaps b1->startangle
 		for (int i = b2->startline; i <= b2->endline; i++)
diff --git a/source/core/rendering/scene/hw_bunchdrawer.h b/source/core/rendering/scene/hw_bunchdrawer.h
index 6996adf98..b1b1322ee 100644
--- a/source/core/rendering/scene/hw_bunchdrawer.h
+++ b/source/core/rendering/scene/hw_bunchdrawer.h
@@ -12,8 +12,8 @@ struct FBunch
 	int startline;
 	int endline;
 	bool portal;
-	binangle startangle;
-	binangle endangle;
+	angle_t startangle;
+	angle_t endangle;
 };
 
 class BunchDrawer