diff --git a/source/games/sw/src/_polymost.cpp b/source/games/sw/src/_polymost.cpp
index a7059e9ae..e01bd8760 100644
--- a/source/games/sw/src/_polymost.cpp
+++ b/source/games/sw/src/_polymost.cpp
@@ -53,9 +53,9 @@ void DrawOverlapRoom(int tx, int ty, int tz, fixed_t tq16ang, fixed_t tq16horiz,
         // reset Z's
         for (int i = 0; i < save.zcount; i++)
         {
-            sector[save.sectnum[i]].floorz = save.zval[i];
-            sector[save.sectnum[i]].floorpicnum = save.pic[i];
-            sector[save.sectnum[i]].floorheinum = save.slope[i];
+            save.sector[i]->floorz = save.zval[i];
+            save.sector[i]->floorpicnum = save.pic[i];
+            save.sector[i]->floorheinum = save.slope[i];
         }
 
         analyzesprites(pm_tsprite, pm_spritesortcnt, tx, ty, tz, false);
@@ -78,9 +78,9 @@ void DrawOverlapRoom(int tx, int ty, int tz, fixed_t tq16ang, fixed_t tq16horiz,
             // reset Z's
             for (int i = 0; i < save.zcount; i++)
             {
-                sector[save.sectnum[i]].ceilingz = save.zval[i];
-                sector[save.sectnum[i]].ceilingpicnum = save.pic[i];
-                sector[save.sectnum[i]].ceilingheinum = save.slope[i];
+                save.sector[i]->ceilingz = save.zval[i];
+                save.sector[i]->ceilingpicnum = save.pic[i];
+                save.sector[i]->ceilingheinum = save.slope[i];
             }
 
             analyzesprites(pm_tsprite, pm_spritesortcnt, tx, ty, tz, false);
diff --git a/source/games/sw/src/rooms.cpp b/source/games/sw/src/rooms.cpp
index 977c93266..304152d59 100644
--- a/source/games/sw/src/rooms.cpp
+++ b/source/games/sw/src/rooms.cpp
@@ -43,8 +43,8 @@ BEGIN_SW_NS
 #define ZMAX 400
 typedef struct
 {
+    sectortype* sector[ZMAX];
     int32_t zval[ZMAX];
-    int16_t sectnum[ZMAX];
     int16_t pic[ZMAX];
     int16_t zcount;
     int16_t slope[ZMAX];
@@ -821,7 +821,7 @@ bool FindCeilingView(int match, int* x, int* y, int z, int* sectnum)
                 if (sp->hitag == VIEW_LEVEL2)
                 {
                     // save it off
-                    save.sectnum[save.zcount] = sp->sectnum;
+                    save.sector[save.zcount] = sp->sector();
                     save.zval[save.zcount] = sp->sector()->floorz;
                     save.pic[save.zcount] = sp->sector()->floorpicnum;
                     save.slope[save.zcount] = sp->sector()->floorheinum;
@@ -917,7 +917,7 @@ bool FindFloorView(int match, int* x, int* y, int z, int* sectnum)
                 if (sp->hitag == VIEW_LEVEL1)
                 {
                     // save it off
-                    save.sectnum[save.zcount] = sp->sectnum;
+                    save.sector[save.zcount] = sp->sector();
                     save.zval[save.zcount] = sp->sector()->ceilingz;
                     save.pic[save.zcount] = sp->sector()->ceilingpicnum;
                     save.slope[save.zcount] = sp->sector()->ceilingheinum;