From d35785f1eebcfc416e6b4aeb584500eeb68c0646 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@users.noreply.github.com>
Date: Mon, 3 Oct 2022 21:37:18 +0200
Subject: [PATCH] - added wrappers, part 7 and final

---
 source/games/sw/src/game.h    |  1 +
 source/games/sw/src/track.cpp | 12 ++++++------
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/source/games/sw/src/game.h b/source/games/sw/src/game.h
index 0e3043fec..bf76cb4da 100644
--- a/source/games/sw/src/game.h
+++ b/source/games/sw/src/game.h
@@ -1515,6 +1515,7 @@ struct SECTOR_OBJECT
     void set_int_i_ang(int i) { __i_ang = i; }
     void set_int_i_ang_tgt(int i) { __i_ang_tgt = i; }
     void set_int_i_ang_moving(int i) { __i_ang_moving = i; }
+    void set_int_i_ang_orig(int i) { __i_ang_orig = i; }
 
 
     int16_t clipbox_num,
diff --git a/source/games/sw/src/track.cpp b/source/games/sw/src/track.cpp
index f609ff61f..adea03506 100644
--- a/source/games/sw/src/track.cpp
+++ b/source/games/sw/src/track.cpp
@@ -944,7 +944,7 @@ void SetupSectorObject(sectortype* sectp, short tag)
         sop->wait_tics = 0;
         sop->set_int_i_spin_speed(0);
         sop->set_int_i_spin_ang(0);
-        sop->__i_ang_orig = 0;
+        sop->set_int_i_ang_orig(0);
         sop->clipdist = 1024;
         sop->target_dist = 0;
         sop->turn_speed = 4;
@@ -1204,7 +1204,7 @@ void SetupSectorObject(sectortype* sectp, short tag)
                 case SO_ANGLE:
                     sop->set_int_i_ang(actor->int_ang());
                     sop->set_int_i_ang_moving(actor->int_ang());
-                    sop->__i_ang_orig = sop->int_i_ang();
+                    sop->set_int_i_ang_orig(sop->int_i_ang());
                     sop->set_int_i_last_ang(sop->int_i_ang());
                     sop->set_int_i_spin_ang(0);
                     KillActor(actor);
@@ -2639,10 +2639,10 @@ void DoTornadoObject(SECTOR_OBJECT* sop)
     // this made them move together more or less - cool!
     //static short ang = 1024;
     int ret;
-    short *ang = &sop->__i_ang_moving;
+    short ang = sop->__i_ang_moving;
 
-    xvect = sop->vel * bcos(*ang);
-    yvect = sop->vel * bcos(*ang);
+    xvect = sop->vel * bcos(ang);
+    yvect = sop->vel * bcos(ang);
 
     auto cursect = sop->op_main_sector; // for sop->vel
     double floor_dist = (abs(cursect->ceilingz - cursect->floorz)) * 0.25;
@@ -2654,7 +2654,7 @@ void DoTornadoObject(SECTOR_OBJECT* sop)
 
     if (coll.type != kHitNone)
     {
-        *ang = NORM_ANGLE(*ang + 1024 + RANDOM_P2(512) - 256);
+        sop->set_int_i_ang_moving(NORM_ANGLE(ang + 1024 + RANDOM_P2(512) - 256));
     }
 
     TornadoSpin(sop);