- implement Havana secret base cell iterator tricks

Author: SoapyMan

DriverLevelTool/driver_routines/regions_d2.cpp

@@ -314,7 +314,7 @@ CELL_DATA* CDriver2LevelRegion::GetCellData(int num) const
 }
 
 // cell iterator
-PACKED_CELL_OBJECT* CDriver2LevelRegion::StartIterator(CELL_ITERATOR* iterator, int cellNumber) const
+PACKED_CELL_OBJECT* CDriver2LevelRegion::StartIterator(CELL_ITERATOR_D2* iterator, int cellNumber) const
 {
 	ushort cell_ptr = m_cellPointers[cellNumber];
 
@@ -341,14 +341,32 @@ PACKED_CELL_OBJECT* CDriver2LevelRegion::StartIterator(CELL_ITERATOR* iterator,
 	iterator->nearCell.z = (cellz - (mapInfo.cells_down / 2))* mapInfo.cell_size;
 
 	// get the packed cell data start and near cell
-	CELL_DATA& cell = m_cells[cell_ptr];
+	CELL_DATA* cell = &m_cells[cell_ptr];
 
-	if (cell.num & 0x4000) // FIXME: other objects are flagged with 0x8000 etc
-		return nullptr;
+	int drawValue = iterator->drawValue;
 
-	PACKED_CELL_OBJECT* ppco = GetCellObject(cell.num & 0x3fff);
+	if(drawValue != -1)
+	{
+		if (drawValue == 0)
+		{
+			if (cell->num & 0x4000)
+				return nullptr;
+		}
+		else
+		{
+			cell++;
+			while (cell->num != (drawValue | 0x4000))
+			{
+				if (cell->num & 0x8000)
+					return nullptr;
+				
+				cell++;
+			}
+		}
+	}
 
-	iterator->pcd = &cell;
+	PACKED_CELL_OBJECT* ppco = GetCellObject(cell->num & 0x3fff);
+	iterator->pcd = cell;
 
 	if (ppco->value == 0xffff && (ppco->pos.vy & 1))
 		ppco = ((CDriver2LevelMap*)m_owner)->GetNextPackedCop(iterator);
@@ -527,7 +545,7 @@ int CDriver2LevelMap::MapHeight(const VECTOR_NOPAD& position) const
 //-------------------------------------------------------------
 // returns first cell object of cell
 //-------------------------------------------------------------
-PACKED_CELL_OBJECT* CDriver2LevelMap::GetFirstPackedCop(CELL_ITERATOR* iterator, int cellx, int cellz) const
+PACKED_CELL_OBJECT* CDriver2LevelMap::GetFirstPackedCop(CELL_ITERATOR_D2* iterator, int cellx, int cellz) const
 {
 	// lookup region
 	const int region_x = cellx / m_mapInfo.region_size;
@@ -560,14 +578,33 @@ PACKED_CELL_OBJECT* CDriver2LevelMap::GetFirstPackedCop(CELL_ITERATOR* iterator,
 	iterator->nearCell.z = (cellz - (m_mapInfo.cells_down / 2)) * m_mapInfo.cell_size;
 
 	// get the packed cell data start and near cell
-	CELL_DATA& cell = region.m_cells[cell_ptr];
+	CELL_DATA* cell = &region.m_cells[cell_ptr];
 
-	if (cell.num & 0x4000) // FIXME: other objects are flagged with 0x8000 etc
-		return nullptr;
+	int drawValue = iterator->drawValue;
+
+	if (drawValue != -1)
+	{
+		if (drawValue == 0)
+		{
+			if (cell->num & 0x4000)
+				return nullptr;
+		}
+		else
+		{
+			cell++;
+			while (cell->num != (drawValue | 0x4000))
+			{
+				if (cell->num & 0x8000)
+					return nullptr;
+
+				cell++;
+			}
+		}
+	}
 
-	PACKED_CELL_OBJECT* ppco = region.GetCellObject(cell.num & 0x3fff);
+	PACKED_CELL_OBJECT* ppco = region.GetCellObject(cell->num & 0x3fff);
 
-	iterator->pcd = &cell;
+	iterator->pcd = cell;
 
 	if (ppco->value == 0xffff && (ppco->pos.vy & 1))
 		ppco = GetNextPackedCop(iterator);
@@ -580,7 +617,7 @@ PACKED_CELL_OBJECT* CDriver2LevelMap::GetFirstPackedCop(CELL_ITERATOR* iterator,
 //-------------------------------------------------------------
 // iterates cell objects
 //-------------------------------------------------------------
-PACKED_CELL_OBJECT* CDriver2LevelMap::GetNextPackedCop(CELL_ITERATOR* iterator) const
+PACKED_CELL_OBJECT* CDriver2LevelMap::GetNextPackedCop(CELL_ITERATOR_D2* iterator) const
 {
 	ushort num;
 	PACKED_CELL_OBJECT* ppco;
@@ -592,7 +629,7 @@ PACKED_CELL_OBJECT* CDriver2LevelMap::GetNextPackedCop(CELL_ITERATOR* iterator)
 		iterator->pcd++;
 		num = iterator->pcd->num;
 
-		if (num & 0x4000) // FIXME: other objects are flagged with 0x8000 etc
+		if (iterator->drawValue != -1 && num & 0x4000)
 			return nullptr;
 
 		ppco = iterator->region->GetCellObject(num & 0x3fff);

DriverLevelTool/driver_routines/regions_d2.h

@@ -10,12 +10,18 @@
 class CDriver2LevelRegion;
 class CDriver2LevelMap;
 
-struct CELL_ITERATOR
+struct CELL_ITERATOR_D2
 {
+	CELL_ITERATOR_D2()
+	{
+		drawValue = -1;
+	}
+	
 	CDriver2LevelRegion*	region;
 	CELL_DATA*				pcd;
 	PACKED_CELL_OBJECT*		ppco;
 	XZPAIR					nearCell;
+	int						drawValue;
 };
 
 typedef short* (*sdBspCallback)(sdNode* node, XZPAIR* pos);
@@ -35,7 +41,7 @@ class CDriver2LevelRegion : public CBaseLevelRegion
 	CELL_DATA*				GetCellData(int num) const;
 
 	// cell iterator
-	PACKED_CELL_OBJECT*		StartIterator(CELL_ITERATOR* iterator, int cellNumber) const;
+	PACKED_CELL_OBJECT*		StartIterator(CELL_ITERATOR_D2* iterator, int cellNumber) const;
 
 	sdPlane*				SdGetCell(const VECTOR_NOPAD& position, int& sdLevel, sdBspCallback bspWalker) const;
 
@@ -82,8 +88,8 @@ class CDriver2LevelMap : public CBaseLevelMap
 
 	//----------------------------------------
 	// cell iterator
-	PACKED_CELL_OBJECT*		GetFirstPackedCop(CELL_ITERATOR* iterator, int cellx, int cellz) const;
-	PACKED_CELL_OBJECT*		GetNextPackedCop(CELL_ITERATOR* iterator) const;
+	PACKED_CELL_OBJECT*		GetFirstPackedCop(CELL_ITERATOR_D2* iterator, int cellx, int cellz) const;
+	PACKED_CELL_OBJECT*		GetNextPackedCop(CELL_ITERATOR_D2* iterator) const;
 	static bool				UnpackCellObject(CELL_OBJECT& co, PACKED_CELL_OBJECT* pco, const XZPAIR& nearCell);
 
 protected:

DriverLevelTool/exporter/export_regions.cpp

@@ -127,7 +127,7 @@ int ExportRegionDriver2(CDriver2LevelRegion* region, IVirtualStream* levelFileSt
 	// walk through all cell data
 	for (int i = 0; i < mapInfo.region_size * mapInfo.region_size; i++)
 	{
-		CELL_ITERATOR iterator;
+		CELL_ITERATOR_D2 iterator;
 		PACKED_CELL_OBJECT* pco = region->StartIterator(&iterator, i);
 
 		if (!pco)

DriverLevelTool/viewer/renderlevel.cpp

@@ -148,7 +148,7 @@ void DrawLevelDriver2(const Vector3D& cameraPos, float cameraAngleY, const Volum
 				icell.x > -1 && icell.x < levMapDriver2->GetCellsAcross() &&
 				icell.z > -1 && icell.z < levMapDriver2->GetCellsDown())
 			{
-				CELL_ITERATOR ci;
+				CELL_ITERATOR_D2 ci;
 				PACKED_CELL_OBJECT* ppco;
 
 				levMapDriver2->SpoolRegion(spoolContext, icell);