- separate D1, D2 and shared region code

Author: SoapyMan

DriverLevelTool/driver_level.h

@@ -24,7 +24,7 @@ extern IVirtualStream*			g_levStream;
 
 extern CDriverLevelTextures		g_levTextures;
 extern CDriverLevelModels		g_levModels;
-extern CDriver2LevelMap			g_levMap;
+extern CBaseLevelMap*			g_levMap;
 
 //----------------------------------------------------------
 

DriverLevelTool/driver_routines/level.cpp

@@ -1,4 +1,5 @@
 #include "driver_level.h"
+#include "regions_d2.h"
 #include "core/VirtualStream.h"
 #include "util/DkList.h"
 
@@ -13,7 +14,7 @@ char*						g_overlayMapData = nullptr;
 
 CDriverLevelTextures		g_levTextures;
 CDriverLevelModels			g_levModels;
-CDriver2LevelMap			g_levMap;
+CBaseLevelMap*				g_levMap = nullptr;
 
 //---------------------------------------------------------------------------------------------------------------------------------
 
@@ -117,7 +118,16 @@ void ProcessLumps(IVirtualStream* pFile)
 	// perform auto-detection if format is not specified
 	if(g_format == LEV_FORMAT_AUTODETECT)
 		DetectLevelFormat(pFile);
-	
+
+	if(!g_levMap)
+	{
+		// failed to detect Driver 1 level file - try Driver 2 loader
+		if (g_format >= LEV_FORMAT_DRIVER2_ALPHA16 || g_format == LEV_FORMAT_AUTODETECT)
+			g_levMap = new CDriver2LevelMap();
+		//else
+		//	g_levMap = new CDriver1LevelMap();
+	}
+
 	int lump_count = 255; // Driver 2 difference: you not need to read lump count
 
 	// Driver 1 has lump count
@@ -142,7 +152,7 @@ void ProcessLumps(IVirtualStream* pFile)
 				break;
 			case LUMP_MAP:
 				MsgWarning("LUMP_MAP ofs=%d size=%d\n", pFile->Tell(), lump.size);
-				g_levMap.LoadMapLump(pFile);
+				g_levMap->LoadMapLump(pFile);
 				break;
 			case LUMP_TEXTURENAMES:
 				MsgWarning("LUMP_TEXTURENAMES ofs=%d size=%d\n", pFile->Tell(), lump.size);
@@ -171,7 +181,7 @@ void ProcessLumps(IVirtualStream* pFile)
 				break;
 			case LUMP_SPOOLINFO:
 				MsgWarning("LUMP_SPOOLINFO ofs=%d size=%d\n", pFile->Tell(), lump.size);
-				g_levMap.LoadSpoolInfoLump(pFile);
+				g_levMap->LoadSpoolInfoLump(pFile);
 				break;
 			case LUMP_STRAIGHTS2:
 				MsgWarning("LUMP_STRAIGHTS2 ofs=%d size=%d\n", pFile->Tell(), lump.size);
@@ -322,7 +332,7 @@ void FreeLevelData()
 		delete g_levStream;
 	g_levStream = nullptr;
 
-	g_levMap.FreeAll();
+	g_levMap->FreeAll();
 	g_levTextures.FreeAll();
 	g_levModels.FreeAll();
 

DriverLevelTool/driver_routines/models.h

@@ -78,7 +78,7 @@ struct CarModelData_t
 
 class CDriverLevelModels
 {
-	friend class CDriver2LevelMap;
+	friend class CBaseLevelMap;
 public:
 	CDriverLevelModels();
 	virtual ~CDriverLevelModels();

DriverLevelTool/driver_routines/region_d1.h

@@ -0,0 +1,64 @@
+#ifndef REGION_D1
+#define REGION_D1
+#include "regions.h"
+
+
+//----------------------------------------------------------------------------------
+// DRIVER 1
+//----------------------------------------------------------------------------------
+
+// Driver 1 region
+class CDriver1LevelRegion : public CBaseLevelRegion
+{
+	friend class CDriver1LevelMap;
+public:
+	void					FreeAll() override;
+	void					LoadRegionData(IVirtualStream* pFile, Spool* spool) override;
+
+	CELL_OBJECT*			GetCellObject(int num) const;
+
+protected:
+	CELL_DATA*				m_cells{ nullptr };				// cell data that holding information about cell pointers. 3D world seeks cells first here
+	CELL_OBJECT*			m_cellObjects{ nullptr };		// cell objects that represents objects placed in the world
+};
+
+struct CELL_ITERATOR_D1
+{
+	CDriver1LevelRegion*	region;
+	CELL_DATA_D1*			pcd;
+	CELL_OBJECT*			pco;
+	XZPAIR					nearCell;
+};
+
+// Driver 1 level map
+class CDriver1LevelMap : public CBaseLevelMap
+{
+	friend class CDriver2LevelRegion;
+public:
+	void					FreeAll() override;
+
+	//----------------------------------------
+
+	void 					LoadMapLump(IVirtualStream* pFile) override;
+	void					LoadSpoolInfoLump(IVirtualStream* pFile) override;
+
+	void					SpoolRegion(const XZPAIR& cell) override;
+	void					SpoolRegion(int regionIdx) override;
+
+	CBaseLevelRegion*		GetRegion(const XZPAIR& cell) const override;
+	CBaseLevelRegion*		GetRegion(int regionIdx) const override;
+
+	//----------------------------------------
+	// cell iterator
+	PACKED_CELL_OBJECT*		GetFirstPackedCop(CELL_ITERATOR_D1* iterator, int cellx, int cellz) const;
+	PACKED_CELL_OBJECT*		GetNextPackedCop(CELL_ITERATOR_D1* iterator) const;
+
+protected:
+
+	// Driver 2 - specific
+	CDriver1LevelRegion*	m_regions{ nullptr };					// map of regions
+	CELL_OBJECT*			m_straddlers{ nullptr };				// cell objects between regions
+};
+
+
+#endif