From e99a9236cfb8ee0696a5cb042732e370c54d4cfa Mon Sep 17 00:00:00 2001
From: Kp <kp@valhallalegends.com>
Date: Sat, 11 Apr 2015 04:01:29 +0000
Subject: [PATCH] Avoid redundant vsegptridx calculation in object_move_one

---
 common/main/physics.h    | 2 +-
 similar/main/object.cpp  | 5 +++--
 similar/main/physics.cpp | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/common/main/physics.h b/common/main/physics.h
index 5d6bde021..6381a4a8e 100644
--- a/common/main/physics.h
+++ b/common/main/physics.h
@@ -40,7 +40,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 // these global vars are set after a call to do_physics_sim().  Ugly, I know.
 // list of segments went through
 extern unsigned n_phys_segs;
-extern array<int, MAX_FVI_SEGS> phys_seglist;
+extern array<segnum_t, MAX_FVI_SEGS> phys_seglist;
 
 // Simulate a physics object for this frame
 void do_physics_sim(vobjptridx_t obj);
diff --git a/similar/main/object.cpp b/similar/main/object.cpp
index 9e2a6d3f4..dcd6caf96 100644
--- a/similar/main/object.cpp
+++ b/similar/main/object.cpp
@@ -1711,9 +1711,10 @@ static void object_move_one(const vobjptridx_t obj)
 			int	old_level = Current_level_num;
 #endif
 			for (int i=0;i<n_phys_segs-1;i++) {
-				auto connect_side = find_connect_side(&Segments[phys_seglist[i+1]], &Segments[phys_seglist[i]]);
+				const auto seg0 = vsegptridx(phys_seglist[i]);
+				const auto connect_side = find_connect_side(vcsegptridx(phys_seglist[i+1]), seg0);
 				if (connect_side != -1)
-					check_trigger(&Segments[phys_seglist[i]], connect_side, obj,0);
+					check_trigger(seg0, connect_side, obj,0);
 #if defined(DXX_BUILD_DESCENT_II)
 				//maybe we've gone on to the next level.  if so, bail!
 				if (Current_level_num != old_level)
diff --git a/similar/main/physics.cpp b/similar/main/physics.cpp
index 1d3680d4e..10e9811a0 100644
--- a/similar/main/physics.cpp
+++ b/similar/main/physics.cpp
@@ -159,7 +159,7 @@ static void set_object_turnroll(const vobjptr_t obj)
 
 //list of segments went through
 unsigned n_phys_segs;
-array<int, MAX_FVI_SEGS> phys_seglist;
+array<segnum_t, MAX_FVI_SEGS> phys_seglist;
 
 
 #define MAX_IGNORE_OBJS 100