- made the MapSectionGenerator a class to remove a global array.

src/gl/data/gl_setup.cpp

@@ -49,14 +49,36 @@
 #include "gl/dynlights/gl_glow.h"
 #include "gl/utility/gl_clock.h"
 
+//==========================================================================
+//
+// Map section generation
+// Map sections are physically separated parts of the map.
+// If the player is in section A, any map part in other sections can
+// often be quickly discarded to improve performance.
+//
+//==========================================================================
+
+struct MapSectionGenerator
+{
+	struct cvertex_t
+	{
+		double X, Y;
+
+		operator int() const { return xs_FloorToInt(X) + 65536 * xs_FloorToInt(Y); }
+		bool operator!= (const cvertex_t &other) const { return fabs(X - other.X) >= EQUAL_EPSILON || fabs(Y - other.Y) >= EQUAL_EPSILON; }
+		cvertex_t& operator =(const vertex_t *v) { X = v->fX(); Y = v->fY(); return *this; }
+	};
+
+	typedef TMap<cvertex_t, int> FSectionVertexMap;
+	TArray<subsector_t *> MapSectionCollector;
+
 	//==========================================================================
 	//
 	// 
 	//
 	//==========================================================================
-static TArray<subsector_t *> MapSectionCollector;
 
-static void DoSetMapSection(subsector_t *sub, int num)
+	void DoSetMapSection(subsector_t *sub, int num)
 	{
 		MapSectionCollector.Resize(1);
 		MapSectionCollector[0] = sub;
@@ -93,18 +115,8 @@ static void DoSetMapSection(subsector_t *sub, int num)
 	//
 	//==========================================================================
 
-struct cvertex_t
-{
-	double X, Y;
 
-	operator int() const { return xs_FloorToInt(X) + 65536 * xs_FloorToInt(Y); }
+	int MergeMapSections(int num)
-	bool operator!= (const cvertex_t &other) const { return fabs(X - other.X) >= EQUAL_EPSILON || fabs(Y - other.Y) >= EQUAL_EPSILON; }
-	cvertex_t& operator =(const vertex_t *v) { X = v->fX(); Y = v->fY(); return *this; }
-};
-
-typedef TMap<cvertex_t, int> FSectionVertexMap;
-
-static int MergeMapSections(int num)
 	{
 		FSectionVertexMap vmap;
 		FSectionVertexMap::Pair *pair;
@@ -176,7 +188,7 @@ static int MergeMapSections(int num)
 	//
 	//==========================================================================
 
-static void SetMapSections()
+	void SetMapSections()
 	{
 		bool set;
 		int num = 0;
@@ -201,6 +213,7 @@ static void SetMapSections()
 		Printf("%d map sections found\n", num);
 	#endif
 	}
+};
 
 //==========================================================================
 //
@@ -283,7 +296,8 @@ static void PrepareSectorData()
 			}
 		}
 	}
-	SetMapSections();
+	MapSectionGenerator msg;
+	msg.SetMapSections();
 }
 
 //==========================================================================