From d405da9195bdbb1f08519be0229b669742a1b1b0 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@users.noreply.github.com>
Date: Thu, 18 Nov 2021 00:07:38 +0100
Subject: [PATCH] - changed furthestcanseepoint return value

This does not need to return a sector - the caller merely expects success or failure.
---
 source/games/duke/src/actors.cpp   | 13 +++++++------
 source/games/duke/src/dukeactor.h  | 11 -----------
 source/games/duke/src/gameexec.cpp |  2 +-
 3 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/source/games/duke/src/actors.cpp b/source/games/duke/src/actors.cpp
index d4508eaa8..621031502 100644
--- a/source/games/duke/src/actors.cpp
+++ b/source/games/duke/src/actors.cpp
@@ -5098,16 +5098,17 @@ int furthestangle(DDukeActor *actor, int angs)
 
 //---------------------------------------------------------------------------
 //
-// 
+// return value was changed to what its only caller really expects
 //
 //---------------------------------------------------------------------------
 
 int furthestcanseepoint(DDukeActor *actor, DDukeActor* tosee, int* dax, int* day)
 {
 	auto s = actor->s;
-	int j, hitsect, angincs;
+	int j, angincs;
 	int hx, hy, hz, d, da;//, d, cd, ca,tempx,tempy,cx,cy;
 	DDukeActor* dd;
+	sectortype* hitsect;
 
 	if ((actor->temp_data[0] & 63)) return -1;
 
@@ -5118,21 +5119,21 @@ int furthestcanseepoint(DDukeActor *actor, DDukeActor* tosee, int* dax, int* day
 	auto ts = tosee->s;
 	for (j = ts->ang; j < (2048 + ts->ang); j += (angincs - (krand() & 511)))
 	{
-		hitscanw(ts->x, ts->y, ts->z - (16 << 8), ts->sectnum, bcos(j), bsin(j), 16384 - (krand() & 32767), 
+		hitscan(ts->x, ts->y, ts->z - (16 << 8), ts->sectnum, bcos(j), bsin(j), 16384 - (krand() & 32767), 
 			&hitsect, nullptr, &dd, &hx, &hy, &hz, CLIPMASK1);
 
 		d = abs(hx - ts->x) + abs(hy - ts->y);
 		da = abs(hx - s->x) + abs(hy - s->y);
 
 		if (d < da)
-			if (cansee(hx, hy, hz, hitsect, s->x, s->y, s->z - (16 << 8), s->sectnum))
+			if (cansee(hx, hy, hz, sectnum(hitsect), s->x, s->y, s->z - (16 << 8), s->sectnum))
 			{
 				*dax = hx;
 				*day = hy;
-				return hitsect;
+				return 1;
 			}
 	}
-	return -1;
+	return 0;
 }
 
 //---------------------------------------------------------------------------
diff --git a/source/games/duke/src/dukeactor.h b/source/games/duke/src/dukeactor.h
index a693b6f4e..05df38179 100644
--- a/source/games/duke/src/dukeactor.h
+++ b/source/games/duke/src/dukeactor.h
@@ -197,17 +197,6 @@ inline void getzrange_ex(int x, int y, int z, int sectnum, int32_t* ceilz, Colli
 	florhit.setFromEngine(fh);
 }
 
-inline int hitscanw(int x, int y, int z, int sectnum, int32_t vx, int32_t vy, int32_t vz,
-	int* hitsect, int* hitwall, DDukeActor** hitspr, int* hitx, int* hity, int* hitz, uint32_t cliptype)
-{
-	short hitsprt, hitsct, hitwal;
-	int res = ::hitscan(x, y, z, sectnum, vx, vy, vz, &hitsct, &hitwal, &hitsprt, hitx, hity, hitz, cliptype);
-	if (hitspr) *hitspr = hitsprt == -1 ? nullptr : &hittype[hitsprt];
-	if (hitsect) *hitsect = hitsct;
-	if (hitwall) *hitwall = hitwal;
-	return res;
-}
-
 inline int hitscan(int x, int y, int z, int sectnum, int32_t vx, int32_t vy, int32_t vz,
 	sectortype** hitsect, walltype** hitwall, DDukeActor** hitspr, int* hitx, int* hity, int* hitz, uint32_t cliptype)
 {
diff --git a/source/games/duke/src/gameexec.cpp b/source/games/duke/src/gameexec.cpp
index 0a2c86bc2..5aef5ec63 100644
--- a/source/games/duke/src/gameexec.cpp
+++ b/source/games/duke/src/gameexec.cpp
@@ -1483,7 +1483,7 @@ static bool ifcansee(DDukeActor* actor, int pnum)
 	{
 		// search around for target player
 		// also modifies 'target' x&y if found.
-		j = furthestcanseepoint(actor, tosee, &actor->lastvx, &actor->lastvy) != -1;
+		j = furthestcanseepoint(actor, tosee, &actor->lastvx, &actor->lastvy);
 	}
 	else
 	{