From a7d62f944bba2de461ddab2eaa6773f2308f9150 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@users.noreply.github.com>
Date: Sat, 20 Aug 2022 22:12:05 +0200
Subject: [PATCH] - wrapped user.oz reads.

---
 source/games/sw/src/game.h     |  1 +
 source/games/sw/src/spike.cpp  | 14 +++++++-------
 source/games/sw/src/sprite.cpp |  4 ++--
 source/games/sw/src/vator.cpp  | 14 +++++++-------
 4 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/source/games/sw/src/game.h b/source/games/sw/src/game.h
index 93bc0f4a8..20dd19266 100644
--- a/source/games/sw/src/game.h
+++ b/source/games/sw/src/game.h
@@ -930,6 +930,7 @@ struct USER
         memset(&WallP, 0, sizeof(USER) - myoffsetof(USER, WallP));
     }
 
+    int int_oz() const { return oz; }
     int int_loz() const { return loz * zworldtoint; }
     int int_hiz() const { return hiz * zworldtoint; }
 
diff --git a/source/games/sw/src/spike.cpp b/source/games/sw/src/spike.cpp
index 256d3af3d..4fa98625e 100644
--- a/source/games/sw/src/spike.cpp
+++ b/source/games/sw/src/spike.cpp
@@ -49,18 +49,18 @@ void ReverseSpike(DSWActor* actor)
     }
 
     // moving toward to OFF pos
-    if (actor->user.z_tgt == actor->user.oz)
+    if (actor->user.z_tgt == actor->user.int_oz())
     {
-        if (actor->int_pos().Z == actor->user.oz)
+        if (actor->int_pos().Z == actor->user.int_oz())
             actor->user.z_tgt = actor->user.pos.Z;
-        else if (actor->user.pos.Z == actor->user.oz)
+        else if (actor->user.pos.Z == actor->user.int_oz())
             actor->user.z_tgt = actor->int_pos().Z;
     }
     else if (actor->user.z_tgt == actor->user.pos.Z)
     {
-        if (actor->int_pos().Z == actor->user.oz)
+        if (actor->int_pos().Z == actor->user.int_oz())
             actor->user.z_tgt = actor->int_pos().Z;
-        else if (actor->user.pos.Z == actor->user.oz)
+        else if (actor->user.pos.Z == actor->user.int_oz())
             actor->user.z_tgt = actor->user.pos.Z;
     }
 
@@ -326,7 +326,7 @@ int DoSpike(DSWActor* actor)
         }
 
         // setup to go back to the original z
-        if (*lptr != actor->user.oz)
+        if (*lptr != actor->user.int_oz())
         {
             if (actor->user.WaitTics)
                 actor->user.Tics = actor->user.WaitTics;
@@ -335,7 +335,7 @@ int DoSpike(DSWActor* actor)
     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)
+        if (TEST_BOOL3(actor) && actor->user.z_tgt == actor->user.int_oz())
         {
             bool found = false;
 
diff --git a/source/games/sw/src/sprite.cpp b/source/games/sw/src/sprite.cpp
index a10b44cdf..ced657ab7 100644
--- a/source/games/sw/src/sprite.cpp
+++ b/source/games/sw/src/sprite.cpp
@@ -2262,7 +2262,7 @@ void SpriteSetup(void)
 
                         // set orig z
                         actor->user.oz = actor->user.zclip;
-                        actor->opos.Z = actor->user.oz * zinttoworld;
+                        actor->opos.Z = actor->user.int_oz() *  zinttoworld;
                     }
                     else
                     {
@@ -2281,7 +2281,7 @@ void SpriteSetup(void)
 
                         // set orig z
                         actor->user.oz = actor->user.zclip;
-                        actor->opos.Z = actor->user.oz * zinttoworld;
+                        actor->opos.Z = actor->user.int_oz() *  zinttoworld;
                     }
 
                     change_actor_stat(actor, STAT_SPIKE);
diff --git a/source/games/sw/src/vator.cpp b/source/games/sw/src/vator.cpp
index 6ae1d548c..fe9c3c060 100644
--- a/source/games/sw/src/vator.cpp
+++ b/source/games/sw/src/vator.cpp
@@ -54,18 +54,18 @@ void ReverseVator(DSWActor* actor)
     }
 
     // moving toward to OFF pos
-    if (actor->user.z_tgt == actor->user.oz)
+    if (actor->user.z_tgt == actor->user.int_oz())
     {
-        if (actor->int_pos().Z == actor->user.oz)
+        if (actor->int_pos().Z == actor->user.int_oz())
             actor->user.z_tgt = actor->user.pos.Z;
-        else if (actor->user.pos.Z == actor->user.oz)
+        else if (actor->user.pos.Z == actor->user.int_oz())
             actor->user.z_tgt = actor->int_pos().Z;
     }
     else if (actor->user.z_tgt == actor->user.pos.Z)
     {
-        if (actor->int_pos().Z == actor->user.oz)
+        if (actor->int_pos().Z == actor->user.int_oz())
             actor->user.z_tgt = actor->int_pos().Z;
-        else if (actor->user.pos.Z == actor->user.oz)
+        else if (actor->user.pos.Z == actor->user.int_oz())
             actor->user.z_tgt = actor->user.pos.Z;
     }
 
@@ -438,7 +438,7 @@ int DoVator(DSWActor* actor)
         }
 
         // setup to go back to the original z
-        if (zval != actor->user.oz)
+        if (zval != actor->user.int_oz())
         {
             if (actor->user.WaitTics)
                 actor->user.Tics = actor->user.WaitTics;
@@ -447,7 +447,7 @@ int DoVator(DSWActor* actor)
     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)
+        if (TEST_BOOL3(actor) && actor->user.z_tgt == actor->user.int_oz())
         {
             int i;
             bool found = false;