From 8a89313ec40de4084a361a0f46f96ab3c7f7bae4 Mon Sep 17 00:00:00 2001
From: Kp <kp@valhallalegends.com>
Date: Wed, 22 Feb 2017 03:05:44 +0000
Subject: [PATCH] Move compute_segment_center body to dcx

---
 common/main/gameseg.h    |  4 ++--
 similar/main/gameseg.cpp | 18 +++++++++++-------
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/common/main/gameseg.h b/common/main/gameseg.h
index c39c349a1..56770c9c3 100644
--- a/common/main/gameseg.h
+++ b/common/main/gameseg.h
@@ -66,8 +66,8 @@ static inline vms_vector compute_center_point_on_side(const segment &sp, const u
 	vms_vector v;
 	return compute_center_point_on_side(v, sp, side), v;
 }
-void compute_segment_center(vms_vector &vp,vcsegptr_t sp);
-static inline vms_vector compute_segment_center(vcsegptr_t sp)
+void compute_segment_center(vms_vector &vp, const segment &sp);
+static inline vms_vector compute_segment_center(const segment &sp)
 {
 	vms_vector v;
 	compute_segment_center(v, sp);
diff --git a/similar/main/gameseg.cpp b/similar/main/gameseg.cpp
index 024842e67..541926c83 100644
--- a/similar/main/gameseg.cpp
+++ b/similar/main/gameseg.cpp
@@ -112,6 +112,15 @@ static void compute_center_point_on_side(vms_vector &r, const array<unsigned, MA
 	vm_vec_copy_scale(r, vp, F1_0 / 4);
 }
 
+static void compute_segment_center(vms_vector &r, const array<unsigned, MAX_VERTICES_PER_SEGMENT> &verts)
+{
+	vms_vector vp;
+	vm_vec_zero(vp);
+	range_for (auto &v, verts)
+		vm_vec_add2(vp, Vertices[v]);
+	vm_vec_copy_scale(r, vp, F1_0 / 8);
+}
+
 }
 
 namespace dsx {
@@ -132,14 +141,9 @@ void compute_center_point_on_side(vms_vector &vp, const segment &sp, const unsig
 // ------------------------------------------------------------------------------------------
 // Compute segment center.
 //	The center point is defined to be the average of the 8 points defining the segment.
-void compute_segment_center(vms_vector &vp,const vcsegptr_t sp)
+void compute_segment_center(vms_vector &vp, const segment &sp)
 {
-	vm_vec_zero(vp);
-
-	range_for (auto &v, sp->verts)
-		vm_vec_add2(vp,Vertices[v]);
-
-	vm_vec_scale(vp,F1_0/8);
+	compute_segment_center(vp, sp.verts);
 }
 
 // -----------------------------------------------------------------------------