Merge pull request #6 from OpenDriver2/level_viewer

SoapyMan · web-flow · commit 3b89a888f011 · 2021-03-13T16:20:28.000+06:00
critical bug fix
diff --git a/DriverLevelTool/driver_routines/textures.cpp b/DriverLevelTool/driver_routines/textures.cpp
@@ -188,6 +188,7 @@ void CTexturePage::InitFromFile(int id, TEXPAGE_POS& tp, IVirtualStream* pFile)
 
 		for(int i = 0; i < m_numDetails; i++)
 		{
+			m_details[i].detailNum = i;
 			m_details[i].numExtraCLUTs = 0;
 			memset(m_details[i].extraCLUTs, 0, sizeof(m_details[i].extraCLUTs));
 			
diff --git a/DriverLevelTool/driver_routines/textures.h b/DriverLevelTool/driver_routines/textures.h
@@ -41,6 +41,7 @@ struct TexDetailInfo_t
 	TEXINF			info;
 	TEXCLUT*		extraCLUTs[32];
 	int				numExtraCLUTs;
+	int				detailNum;			// index on texture page
 };
 
 //---------------------------------------------------------------------------------------------------------------------------------
diff --git a/DriverLevelTool/exporter/export_textures.cpp b/DriverLevelTool/exporter/export_textures.cpp
@@ -22,7 +22,7 @@ void GetTPageDetailPalettes(DkList<TEXCLUT*>& out, CTexturePage* tpage, TexDetai
 	const TexBitmap_t& bitmap = tpage->GetBitmap();
 
 	// ofc, add default
-	out.append(&bitmap.clut[detail->info.id]);
+	out.append(&bitmap.clut[detail->detailNum]);
 
 	for(int i = 0; i < detail->numExtraCLUTs; i++)
 		out.append(detail->extraCLUTs[i]);
diff --git a/appveyor.yml b/appveyor.yml
@@ -1,4 +1,4 @@
-version: 1.6.{build}
+version: 1.8.{build}
 
 branches:
   only:

Original file line number	Diff line number	Diff line change
`@@ -188,6 +188,7 @@ void CTexturePage::InitFromFile(int id, TEXPAGE_POS& tp, IVirtualStream* pFile)`
`188`	`188`
`189`	`189`	`for(int i = 0; i < m_numDetails; i++)`
`190`	`190`	`{`
	`191`	`+ m_details[i].detailNum = i;`
`191`	`192`	`m_details[i].numExtraCLUTs = 0;`
`192`	`193`	`memset(m_details[i].extraCLUTs, 0, sizeof(m_details[i].extraCLUTs));`
`193`	`194`