diff --git a/source/games/sw/src/game.h b/source/games/sw/src/game.h
index b4cc6a54e..4ec773909 100644
--- a/source/games/sw/src/game.h
+++ b/source/games/sw/src/game.h
@@ -1462,11 +1462,11 @@ struct SECTOR_OBJECT
 
     int    vel,            // velocity
            vel_tgt,        // target velocity
-           update,         // Distance from player at which you continue updating
+           update;         // Distance from player at which you continue updating
 
         // start of must floatify
-           zorig_floor[MAX_SO_SECTOR],      // original z values for all sectors
-           z_tgt,          // target z delta
+    double  zorig_floor[MAX_SO_SECTOR];      // original z values for all sectors
+    int    z_tgt,          // target z delta
            z_rate,         // rate at which z aproaches target
     // only works for single player.
            bob_diff;       // bobbing difference for the frame
diff --git a/source/games/sw/src/track.cpp b/source/games/sw/src/track.cpp
index 3af9b7f18..1e0f1ffff 100644
--- a/source/games/sw/src/track.cpp
+++ b/source/games/sw/src/track.cpp
@@ -718,10 +718,10 @@ void SectorObjectSetupBounds(SECTOR_OBJECT* sop)
             // detection and recognition
             sect->extra |= SECTFX_SECTOR_OBJECT;
 
-            sop->zorig_floor[sop->num_sectors] = sect->int_floorz();
+            sop->zorig_floor[sop->num_sectors] = sect->floorz;
 
             if ((sect->extra & SECTFX_SINK))
-                sop->zorig_floor[sop->num_sectors] += Z(FixedToInt(sect->depth_fixed));
+                sop->zorig_floor[sop->num_sectors] += FixedToInt(sect->depth_fixed);
 
             // lowest and highest floor z's
             if (sect->floorz > sop->floor_loz)
@@ -1972,7 +1972,7 @@ void MoveZ(SECTOR_OBJECT* sop)
             if (sop->sectp[i]->hasU() && (sop->sectp[i]->flags & SECTFU_SO_DONT_BOB))
                 continue;
 
-            (*sectp)->set_int_floorz(sop->zorig_floor[i] + sop->bob_diff);
+            (*sectp)->floorz = sop->zorig_floor[i] + sop->bob_diff * zinttoworld;
         }
     }
 
@@ -1993,7 +1993,7 @@ void MoveZ(SECTOR_OBJECT* sop)
     {
         for (i = 0, sectp = &sop->sectp[0]; *sectp; sectp++, i++)
         {
-            AnimSet(ANIM_Floorz, *sectp, (sop->zorig_floor[i] + sop->z_tgt) * zinttoworld, sop->z_rate);
+            AnimSet(ANIM_Floorz, *sectp, sop->zorig_floor[i] + sop->z_tgt * zinttoworld, sop->z_rate);
         }
 
         sop->flags &= ~(SOBJ_ZDOWN);
@@ -2002,7 +2002,7 @@ void MoveZ(SECTOR_OBJECT* sop)
     {
         for (i = 0, sectp = &sop->sectp[0]; *sectp; sectp++, i++)
         {
-            AnimSet(ANIM_Floorz, *sectp, (sop->zorig_floor[i] + sop->z_tgt) * zinttoworld, sop->z_rate);
+            AnimSet(ANIM_Floorz, *sectp, sop->zorig_floor[i] + sop->z_tgt * zinttoworld, sop->z_rate);
         }
 
         sop->flags &= ~(SOBJ_ZUP);
@@ -2523,7 +2523,7 @@ void OperateSectorObjectForTics(SECTOR_OBJECT* sop, DAngle newang, const DVector
             if (sop->sectp[i]->hasU() && (sop->sectp[i]->flags & SECTFU_SO_DONT_BOB))
                 continue;
 
-            (*sectp)->set_int_floorz(sop->zorig_floor[i] + sop->bob_diff);
+            (*sectp)->floorz = sop->zorig_floor[i] + sop->bob_diff * zinttoworld;
         }
     }