From 17d5242958188e801d08977bdec46a01cb1916e2 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@users.noreply.github.com>
Date: Sun, 21 Aug 2022 10:20:35 +0200
Subject: [PATCH] - got rid of int_z_tgt

---
 source/games/sw/src/game.h     | 1 -
 source/games/sw/src/spike.cpp  | 8 ++++----
 source/games/sw/src/sprite.cpp | 6 +++---
 source/games/sw/src/vator.cpp  | 6 +++---
 4 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/source/games/sw/src/game.h b/source/games/sw/src/game.h
index 778e2c717..6853ef493 100644
--- a/source/games/sw/src/game.h
+++ b/source/games/sw/src/game.h
@@ -932,7 +932,6 @@ struct USER
 
     int int_loz() const { return loz * zworldtoint; }
     int int_hiz() const { return hiz * zworldtoint; }
-    int int_z_tgt() const { return z_tgt * zworldtoint; }
     int int_ceiling_dist() const { return ceiling_dist * zworldtoint; }
     int int_floor_dist() const { return floor_dist * zworldtoint; }
     int int_zclip() const { return zclip * zworldtoint; }
diff --git a/source/games/sw/src/spike.cpp b/source/games/sw/src/spike.cpp
index 4137f587d..8608dd52e 100644
--- a/source/games/sw/src/spike.cpp
+++ b/source/games/sw/src/spike.cpp
@@ -106,7 +106,7 @@ void SetSpikeActive(DSWActor* actor)
         VatorSwitch(SP_TAG2(actor), true);
     else
     // moving to the OFF position
-    if (actor->user.int_z_tgt() == actor->user.int_upos().Z)
+    if (actor->user.z_tgt == actor->user.pos.Z)
         VatorSwitch(SP_TAG2(actor), false);
 }
 
@@ -291,8 +291,8 @@ int DoSpike(DSWActor* actor)
         }
         else
         // in the OFF position
-        if (actor->user.int_z_tgt() == actor->user.int_upos().Z)
-        {
+            if (actor->user.z_tgt == actor->user.pos.Z)
+            {
             short match = SP_TAG2(actor);
 
             // change target
@@ -391,7 +391,7 @@ int DoSpikeAuto(DSWActor* actor)
         }
         else
         // in the DOWN position
-        if (actor->user.int_z_tgt() == actor->user.int_upos().Z)
+        if (actor->user.z_tgt == actor->user.pos.Z)
         {
             // change target
             actor->user.jump_speed = actor->user.vel_tgt;
diff --git a/source/games/sw/src/sprite.cpp b/source/games/sw/src/sprite.cpp
index 370cfa42f..29b446da0 100644
--- a/source/games/sw/src/sprite.cpp
+++ b/source/games/sw/src/sprite.cpp
@@ -6549,11 +6549,11 @@ Collision move_ground_missile(DSWActor* actor, int xchange, int ychange, int cei
     daz = actor->int_pos().Z;
 
     // climbing a wall
-    if (actor->user.int_z_tgt())
+    if (actor->user.z_tgt)
     {
-        if (labs(actor->user.int_z_tgt() - actor->int_pos().Z) > Z(40))
+        if (abs(actor->user.z_tgt - actor->spr.pos.Z) > 40)
         {
-            if (actor->user.int_z_tgt() > actor->int_pos().Z)
+            if (actor->user.z_tgt > actor->spr.pos.Z)
             {
 				actor->spr.pos.Z += 30;
                 return retval;
diff --git a/source/games/sw/src/vator.cpp b/source/games/sw/src/vator.cpp
index 2540cfb5b..b8c0c0cac 100644
--- a/source/games/sw/src/vator.cpp
+++ b/source/games/sw/src/vator.cpp
@@ -107,11 +107,11 @@ void SetVatorActive(DSWActor* actor)
     actor->user.Tics = 0;
 
     // moving to the ON position
-    if (actor->user.int_z_tgt() == actor->int_pos().Z)
+    if (actor->user.z_tgt == actor->spr.pos.Z)
         VatorSwitch(SP_TAG2(actor), true);
     else
     // moving to the OFF position
-    if (actor->user.int_z_tgt() == actor->user.int_upos().Z)
+    if (actor->user.z_tgt == actor->user.pos.Z)
         VatorSwitch(SP_TAG2(actor), false);
 }
 
@@ -443,7 +443,7 @@ int DoVator(DSWActor* actor)
                 actor->user.Tics = actor->user.WaitTics;
         }
     }
-    else // if (*lptr == actor->user.int_z_tgt())
+    else // if (*lptr == actor->user.z_tgt)
     {
         // if heading for the OFF (original) position and should NOT CRUSH
         if (TEST_BOOL3(actor) && actor->user.z_tgt == actor->user.oz)