diff --git a/source/games/sw/src/mclip.cpp b/source/games/sw/src/mclip.cpp
index ad943932b..8f51a1bc4 100644
--- a/source/games/sw/src/mclip.cpp
+++ b/source/games/sw/src/mclip.cpp
@@ -250,7 +250,7 @@ short RectClipTurn(PLAYER* pp, DAngle new_angl, DVector2* qpos, DVector2* opos)
     DAngle rot_angl;
     int point_num;
 
-    rot_angl = new_angl + DAngle::fromBuild(sop->int_i_spin_ang() - sop->int_i_ang_orig());
+    rot_angl = new_angl + sop->spin_ang - sop->ang_orig;
     for (i = 0; i < 4; i++)
     {
         xy[i] = rotatepoint(pp->pos.XY(), opos[i], rot_angl);
diff --git a/source/games/sw/src/morph.cpp b/source/games/sw/src/morph.cpp
index 8cd0a37e3..859246361 100644
--- a/source/games/sw/src/morph.cpp
+++ b/source/games/sw/src/morph.cpp
@@ -163,7 +163,7 @@ short DoSOevent(short match, short state)
                 vel_adj = -SP_TAG7(me_act);
             }
 
-            sop->set_int_i_spin_speed(sop->int_i_spin_speed() + spin_adj);
+            sop->spin_speed += DAngle::fromBuild(spin_adj);
 
             if (TEST_BOOL1(me_act))
                 sop->vel_tgt += vel_adj;
diff --git a/source/games/sw/src/player.cpp b/source/games/sw/src/player.cpp
index 090ba221c..25f88a381 100644
--- a/source/games/sw/src/player.cpp
+++ b/source/games/sw/src/player.cpp
@@ -4816,7 +4816,7 @@ void DoPlayerBeginOperate(PLAYER* pp)
     pp->sop = pp->sop_control = sop;
     sop->controller = pp->actor;
 
-    pp->angle.oang = pp->angle.ang = DAngle::fromBuild(sop->int_i_ang());
+    pp->angle.oang = pp->angle.ang = sop->ang;
     pp->pos.XY() = sop->pmid.XY();
     updatesector(pp->pos, &pp->cursector);
     getzsofslopeptr(pp->cursector, pp->pos, &cz, &fz);
@@ -4900,7 +4900,7 @@ void DoPlayerBeginRemoteOperate(PLAYER* pp, SECTOR_OBJECT* sop)
 
     auto save_sect = pp->cursector;
 
-    pp->angle.oang = pp->angle.ang = DAngle::fromBuild(sop->int_i_ang());
+    pp->angle.oang = pp->angle.ang = sop->ang;
     pp->pos.XY() = sop->pmid.XY();
     updatesector(pp->pos, &pp->cursector);
     getzsofslopeptr(pp->cursector, pp->pos, &cz, &fz);
diff --git a/source/games/sw/src/sector.cpp b/source/games/sw/src/sector.cpp
index 1bc944ca5..ff5afe4b3 100644
--- a/source/games/sw/src/sector.cpp
+++ b/source/games/sw/src/sector.cpp
@@ -1663,7 +1663,7 @@ int OperateSprite(DSWActor* actor, short player_is_operating)
 
         sop = &SectorObject[so_num];
 
-        sop->set_int_i_ang_tgt(NORM_ANGLE(sop->int_i_ang_tgt() + 512));
+        sop->ang_tgt += DAngle90;
 
         PlaySound(DIGI_BIGSWITCH, actor, v3df_none);