- move region loading code to C++ classes

- implement level cell iteration for viewing

Author: SoapyMan

DriverLevelTool/driver_level.h

@@ -21,8 +21,10 @@
 
 // extern some vars
 extern IVirtualStream*			g_levStream;
+
 extern CDriverLevelTextures		g_levTextures;
 extern CDriverLevelModels		g_levModels;
+extern CDriver2LevelMap			g_levMap;
 
 //----------------------------------------------------------
 

DriverLevelTool/driver_routines/d2_types.h

@@ -63,18 +63,18 @@ typedef struct dlevinfo_t
 //------------------------------------------------------------------------------------------------------------
 
 struct OUT_CELL_FILE_HEADER {
-	int cells_across; // size=0, offset=0
-	int cells_down; // size=0, offset=4
-	int cell_size; // size=0, offset=8
+	int cells_across;
+	int cells_down;
+	int cell_size;
 
-	int num_regions; // size=0, offset=12
-	int region_size; // size=0, offset=16
+	int num_regions;
+	int region_size;
 
-	int num_cell_objects; // size=0, offset=20
-	int num_cell_data; // size=0, offset=24
+	int num_cell_objects;
+	int num_cell_data;
 
-	int ambient_light_level; // size=0, offset=28
-	struct VECTOR_NOPAD light_source; // size=12, offset=32
+	int ambient_light_level;
+	VECTOR_NOPAD light_source;
 };
 
 //------------------------------------------------------------------------------------------------------------

DriverLevelTool/driver_routines/level.cpp

@@ -13,6 +13,7 @@ char*						g_overlayMapData = nullptr;
 
 CDriverLevelTextures		g_levTextures;
 CDriverLevelModels			g_levModels;
+CDriver2LevelMap			g_levMap;
 
 //---------------------------------------------------------------------------------------------------------------------------------
 
@@ -64,6 +65,7 @@ void DetectLevelFormat(IVirtualStream* pFile)
 			case LUMP_CHAIR:
 			case LUMP_CAR_MODELS:
 			case LUMP_TEXTUREINFO:
+			case LUMP_STRAIGHTS2:
 				break;
 			case LUMP_JUNCTIONS2:
 			{
@@ -140,7 +142,7 @@ void ProcessLumps(IVirtualStream* pFile)
 				break;
 			case LUMP_MAP:
 				MsgWarning("LUMP_MAP ofs=%d size=%d\n", pFile->Tell(), lump.size);
-				LoadMapLump(pFile);
+				g_levMap.LoadMapLump(pFile);
 				break;
 			case LUMP_TEXTURENAMES:
 				MsgWarning("LUMP_TEXTURENAMES ofs=%d size=%d\n", pFile->Tell(), lump.size);
@@ -169,7 +171,7 @@ void ProcessLumps(IVirtualStream* pFile)
 				break;
 			case LUMP_SPOOLINFO:
 				MsgWarning("LUMP_SPOOLINFO ofs=%d size=%d\n", pFile->Tell(), lump.size);
-				LoadSpoolInfoLump(pFile);
+				g_levMap.LoadSpoolInfoLump(pFile);
 				break;
 			case LUMP_STRAIGHTS2:
 				MsgWarning("LUMP_STRAIGHTS2 ofs=%d size=%d\n", pFile->Tell(), lump.size);
@@ -320,8 +322,7 @@ void FreeLevelData()
 		delete g_levStream;
 	g_levStream = nullptr;
 
-	FreeSpoolData();
-
+	g_levMap.FreeAll();
 	g_levTextures.FreeAll();
 	g_levModels.FreeAll();
 

DriverLevelTool/driver_routines/level.h

@@ -5,6 +5,8 @@
 #ifndef LEVEL_H
 #define LEVEL_H
 
+#define SPOOL_CD_BLOCK_SIZE		2048
+
 // known lumps indexes
 enum LevLumpType
 {