From 1037b2c2964ac2c7251d461fe25ed282bad626a0 Mon Sep 17 00:00:00 2001
From: Kp <kp@valhallalegends.com>
Date: Sat, 2 Feb 2019 18:36:39 +0000
Subject: [PATCH] Flip sense of boss_intersects_wall

This saves a boolean negation passing the result up.
---
 similar/main/ai.cpp | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/similar/main/ai.cpp b/similar/main/ai.cpp
index 675b4802e..78b17f2ce 100644
--- a/similar/main/ai.cpp
+++ b/similar/main/ai.cpp
@@ -1996,24 +1996,31 @@ static imobjptridx_t gate_in_robot(fvmsegptridx &vmsegptridx, int type)
 	return gate_in_robot(type, vmsegptridx(segnum));
 }
 
-// --------------------------------------------------------------------------------------------------------------------
-static int boss_fits_in_seg(fvcvertptr &vcvertptr, const object &boss_objp, const vcsegptridx_t segp)
+}
+
+namespace dcx {
+
+static const shared_segment *boss_intersects_wall(fvcvertptr &vcvertptr, const object_base &boss_objp, const vcsegptridx_t segp)
 {
 	const auto size = boss_objp.size;
 	const auto &&segcenter = compute_segment_center(vcvertptr, segp);
 	auto pos = segcenter;
 	for (uint_fast32_t posnum = 0;;)
 	{
-		if (!sphere_intersects_wall(vcvertptr, pos, segp, size).seg)
-			return 1;
+		const auto seg = sphere_intersects_wall(vcvertptr, pos, segp, size).seg;
+		if (!seg)
+			return seg;
 		if (posnum == segp->verts.size())
-			break;
+			return seg;
 		auto &vertex_pos = *vcvertptr(segp->verts[posnum ++]);
 		vm_vec_avg(pos, vertex_pos, segcenter);
 	}
-	return 0;
 }
 
+}
+
+namespace dsx {
+
 #if defined(DXX_BUILD_DESCENT_II)
 // --------------------------------------------------------------------------------------------------------------------
 //	Create a Buddy bot.
@@ -2073,7 +2080,7 @@ static void init_boss_segments(const segment_array &segments, const object &boss
 		seg_queue[head++] = original_boss_seg;
 		auto &vcvertptr = Vertices.vcptr;
 
-		if ((!size_check) || boss_fits_in_seg(vcvertptr, boss_objp, vcsegptridx(original_boss_seg)))
+		if (!size_check || !boss_intersects_wall(vcvertptr, boss_objp, vcsegptridx(original_boss_seg)))
 		{
 			a.emplace_back(original_boss_seg);
 #if DXX_USE_EDITOR
@@ -2118,7 +2125,7 @@ static void init_boss_segments(const segment_array &segments, const object &boss
 							if (head+QUEUE_SIZE == tail + QUEUE_SIZE-1)
 								Int3();	//	queue overflow.  Make it bigger!
 	
-						if (!size_check || boss_fits_in_seg(vcvertptr, boss_objp, vcsegptridx(csegnum))) {
+						if (!size_check || !boss_intersects_wall(vcvertptr, boss_objp, vcsegptridx(csegnum))) {
 							a.emplace_back(csegnum);
 #if DXX_USE_EDITOR
 							Selected_segs.emplace_back(csegnum);