From 8e01d559e8d1792f70644429b8f3e4c12fa90835 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@users.noreply.github.com>
Date: Wed, 15 Dec 2021 11:12:31 +0100
Subject: [PATCH] - store sector as an index in Section2 and renamed walls to
 lines.

Now everything has the same name and type as in the old section.
---
 source/core/rendering/hw_sections2.cpp | 6 +++---
 source/core/rendering/hw_sections2.h   | 4 ++--
 source/core/sectorgeometry.cpp         | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/source/core/rendering/hw_sections2.cpp b/source/core/rendering/hw_sections2.cpp
index 2c342cfa1..4546eada6 100644
--- a/source/core/rendering/hw_sections2.cpp
+++ b/source/core/rendering/hw_sections2.cpp
@@ -567,12 +567,12 @@ static void ConstructSections(TArray<sectionbuildsector>& builders)
 			auto& srcsect = builder.sections[j];
 			sections2[cursection] = section;
 			sections2PerSector[i][j] = section;
-			section->sector = &sector[i];
+			section->sector = i;
 			section->index = cursection++;
 
 			int sectwalls = srcsect.wallcount;
 			auto walls = (int*)sectionArena.Calloc(sectwalls * sizeof(int));
-			section->walls.Set(walls, sectwalls);
+			section->lines.Set(walls, sectwalls);
 
 			unsigned srcloops = srcsect.loops.Size();
 			auto loops = (Section2Loop*)sectionArena.Calloc(srcloops * sizeof(Section2Loop));
@@ -590,7 +590,7 @@ static void ConstructSections(TArray<sectionbuildsector>& builders)
 				{
 					int wall_i = srcloop[w];
 					auto wal = &sectionLines[wall_i];
-					section->walls[curwall++] = loop.walls[w] = wall_i;
+					section->lines[curwall++] = loop.walls[w] = wall_i;
 					wal->section = section->index;
 				}
 			}
diff --git a/source/core/rendering/hw_sections2.h b/source/core/rendering/hw_sections2.h
index 6737696cb..705d4c14e 100644
--- a/source/core/rendering/hw_sections2.h
+++ b/source/core/rendering/hw_sections2.h
@@ -19,9 +19,9 @@ struct Section2
 	uint8_t dirty;
 	uint8_t geomflags;
 	unsigned index;
-	sectortype* sector;
+	int sector;
 	// this uses a memory arena for storage, so use TArrayView instead of TArray
-	TArrayView<int> walls;
+	TArrayView<int> lines;
 	TArrayView<Section2Loop> loops;
 };
 
diff --git a/source/core/sectorgeometry.cpp b/source/core/sectorgeometry.cpp
index 00944a53e..d0e48d171 100644
--- a/source/core/sectorgeometry.cpp
+++ b/source/core/sectorgeometry.cpp
@@ -426,7 +426,7 @@ ETriangulateResult TriangulateOutlineNodeBuild(const FOutline& polygon, int coun
 
 bool SectionGeometry::ValidateSection(Section2* section, int plane)
 {
-	auto sec = section->sector;
+	auto sec = &sector[section->sector];
 	auto& sdata = data[section->index];
 
 	auto compare = &sdata.compare[plane];
@@ -510,7 +510,7 @@ bool SectionGeometry::CreateMesh(Section2* section)
 
 void SectionGeometry::CreatePlaneMesh(Section2* section, int plane, const FVector2& offset)
 {
-	auto sectorp = section->sector;
+	auto sectorp = &sector[section->sector];
 	// calculate the rest.
 	auto texture = tileGetTexture(plane ? sectorp->ceilingpicnum : sectorp->floorpicnum);
 	auto& sdata = data[section->index];
@@ -562,7 +562,7 @@ void SectionGeometry::MarkDirty(sectortype* sector)
 SectionGeometryPlane* SectionGeometry::get(Section2* section, int plane, const FVector2& offset, TArray<int>** pIndices)
 {
 	if (!section || section->index >= data.Size()) return nullptr;
-	auto sectp = section->sector;
+	auto sectp = &sector[section->sector];
 	if (sectp->dirty) MarkDirty(sectp);
 	if (section->dirty & EDirty::GeometryDirty)
 	{