From a0876223aba9454ea65d94de961c180746533a48 Mon Sep 17 00:00:00 2001
From: "Richard C. Gobeille" <richard@voidpoint.com>
Date: Tue, 2 Jun 2020 04:32:37 -0700
Subject: [PATCH] Assignments

# Conflicts:
#	source/build/src/clip.cpp
---
 source/build/src/clip.cpp      | 14 +++++++-------
 source/duke3d/src/gameexec.cpp |  3 +--
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/source/build/src/clip.cpp b/source/build/src/clip.cpp
index 076a9705c..9d16ff5a6 100644
--- a/source/build/src/clip.cpp
+++ b/source/build/src/clip.cpp
@@ -1724,7 +1724,7 @@ void getzrange(const vec3_t *pos, int16_t sectnum,
     const int32_t dawalclipmask = (cliptype&65535);
     const int32_t dasprclipmask = (cliptype>>16);
 
-    vec2_t closest = { pos->x, pos->y };
+    vec2_t closest = pos->vec2;
     if (enginecompatibility_mode == ENGINECOMPATIBILITY_NONE)
         getsectordist(closest, sectnum, &closest);
     if (enginecompatibility_mode == ENGINECOMPATIBILITY_19950829)
@@ -1786,13 +1786,13 @@ restart_grand:
                     continue;
 
                 int32_t daz, daz2;
-                closest = { pos->x, pos->y };
+                closest = pos->vec2;
                 if (enginecompatibility_mode == ENGINECOMPATIBILITY_NONE)
                     getsectordist(closest, k, &closest);
                 getzsofslope(k,closest.x,closest.y,&daz,&daz2);
 
                 int32_t fz, cz;
-                closest = { pos->x, pos->y };
+                closest = pos->vec2;
                 if (enginecompatibility_mode == ENGINECOMPATIBILITY_NONE)
                     getsectordist(closest, sectq[clipinfo[curidx].qend], &closest);
                 getzsofslope(sectq[clipinfo[curidx].qend],closest.x,closest.y,&cz,&fz);
@@ -1878,7 +1878,7 @@ restart_grand:
 #endif
                 //It actually got here, through all the continue's!!!
                 int32_t daz, daz2;
-                closest = { pos->x, pos->y };
+                closest = pos->vec2;
                 if (enginecompatibility_mode == ENGINECOMPATIBILITY_NONE)
                     getsectordist(closest, k, &closest);
                 if (enginecompatibility_mode == ENGINECOMPATIBILITY_19950829)
@@ -1894,7 +1894,7 @@ restart_grand:
                 {
                     int32_t fz,cz, hitwhat=(curspr-(uspritetype *)sprite)+49152;
 
-                    closest = { pos->x, pos->y };
+                    closest = pos->vec2;
                     if (enginecompatibility_mode == ENGINECOMPATIBILITY_NONE)
                         getsectordist(closest, sectq[clipinfo[curidx].qend], &closest);
                     getzsofslope(sectq[clipinfo[curidx].qend],closest.x,closest.y,&cz,&fz);
@@ -2081,7 +2081,7 @@ restart_grand:
                         {
                             addclipsect(j);
 
-                            closest = { pos->x, pos->y };
+                            closest = pos->vec2;
                             if (enginecompatibility_mode == ENGINECOMPATIBILITY_NONE)
                                 getsectordist(closest, j, &closest);
                             int const daz = getceilzofslope(j, closest.x, closest.y);
@@ -2122,7 +2122,7 @@ restart_grand:
                         {
                             addclipsect(j);
 
-                            closest = { pos->x, pos->y };
+                            closest = pos->vec2;
                             if (enginecompatibility_mode == ENGINECOMPATIBILITY_NONE)
                                 getsectordist(closest, j, &closest);
                             int const daz = getflorzofslope(j, closest.x,closest.y);
diff --git a/source/duke3d/src/gameexec.cpp b/source/duke3d/src/gameexec.cpp
index 7d3a98b57..ef8ef25f8 100644
--- a/source/duke3d/src/gameexec.cpp
+++ b/source/duke3d/src/gameexec.cpp
@@ -3113,8 +3113,7 @@ badindex:
                 {
                     // else, they did see it.
                     // save where we were looking...
-                    vm.pActor->lastv.x = pSprite->x;
-                    vm.pActor->lastv.y = pSprite->y;
+                    vm.pActor->lastv = pSprite->pos.vec2;
                 }
 
                 if (tw && (vm.pSprite->statnum == STAT_ACTOR || vm.pSprite->statnum == STAT_STANDABLE))