WebSVN – spk – Diff – /libspk/src/XspFile.cpp

 	if ( !m_sDescription.Empty() )
 		return m_sDescription;
 	return this->GetShipName(lang);
+}
-bool CXspFile::StartExtractShip(CCatFile *catFile, CyString id, CProgressInfo *progress)
+bool CXspFile::StartExtractShip(CCatFile *catFile, CCatFile *secondCatFile, CyString id, CProgressInfo *progress)
+{
 	id.RemoveChar('\r');
 	while ( id.Right(1) == ";" )
 		id.Truncate((int)id.Length() - 1);
 	m_sID = id.ToString();
 	m_sData = catFile->GetTShipsEntry(id).ToString();
 	// get scene files
 	if ( progress ) progress->UpdateStatus(IMPORTSHIP_SCENE);
-	if ( !this->ExtractSceneFiles(catFile) )
+	if ( !this->ExtractSceneFiles(catFile, secondCatFile) )
 		return false;
 	return true;
+}
-bool CXspFile::StartExtractShip(CyString catFile, CyString id, CProgressInfo *progress)
+bool CXspFile::StartExtractShip(CyString catFile, CyString secondCatFile, CyString id, CProgressInfo *progress)
+{
 	CCatFile cat;
-	if ( cat.Open(catFile, "", CATREAD_CATDECRYPT, false) != CATERR_NONE )
+	if ( cat.Open(catFile, "", CATREAD_CATDECRYPT, false) != CATERR_NONE ) {
+		if ( !secondCatFile.Empty() ) {
+			CCatFile secondCat;
+			if ( secondCat.Open(secondCatFile, "", CATREAD_CATDECRYPT, false) != CATERR_NONE ) {
+				return this->StartExtractShip(&cat, &secondCat, id, progress);
+			}
-		return this->StartExtractShip(&cat, id, progress);
+			return this->StartExtractShip(&cat, NULL, id, progress);
+		}
+	}
 	return false;
+}
 bool CXspFile::ExtractShip(CCatFile *catFile, CyString id, CProgressInfo *progress)
+{
-	if ( !this->StartExtractShip(catFile, id, progress) )
+	if ( !this->StartExtractShip(catFile, NULL, id, progress) )
 		return false;
 	// read the scene file and get the files list
-	if ( !this->ProcessSceneFiles(catFile, progress) )
+	if ( !this->ProcessSceneFiles(catFile, NULL, progress) )
 		return false;
 	// pack all the ship files
 	this->PackAllFiles();
 bool CXspFile::ExtractShip(CyString catFile, CyString id, CProgressInfo *progress)
+{
 	CCatFile cat;
 	if ( cat.Open(catFile, "", CATREAD_CATDECRYPT, false) == CATERR_NONE )
 		return ExtractShip(&cat, id, progress);
 	return false;
+}
 C_File *CXspFile::ExtractFileToPackage(CCatFile *catFile, CyString file, int type, CyString addAs)
+{
+		}
 		File.Remove();
+	}
 	return NULL;
 }
-bool CXspFile::ExtractSceneFiles(CCatFile *catFile)
+bool CXspFile::ExtractSceneFiles(CCatFile *catFile, CCatFile *secondCat)
+{
 	m_pSceneFile = this->ExtractFileToPackage(catFile, CyString("objects\\") + m_sData.token(";", 17) + ".pbd", FILETYPE_SHIPSCENE, CyString("objects\\") + m_sData.token(";", 17) + ".bod");
-	if ( !m_pSceneFile )
-	{
-		m_pSceneFile = this->ExtractFileToPackage(catFile, CyString("objects\\") + m_sData.token(";", 17) + ".bod", FILETYPE_SHIPSCENE);
+	if ( !m_pSceneFile ) m_pSceneFile = this->ExtractFileToPackage(catFile, CyString("objects\\") + m_sData.token(";", 17) + ".bod", FILETYPE_SHIPSCENE);
+	if ( !m_pSceneFile && secondCat ) m_pSceneFile = this->ExtractFileToPackage(secondCat, CyString("objects\\") + m_sData.token(";", 17) + ".pbd", FILETYPE_SHIPSCENE, CyString("objects\\") + m_sData.token(";", 17) + ".bod");
+	if ( !m_pSceneFile && secondCat) m_pSceneFile = this->ExtractFileToPackage(secondCat, CyString("objects\\") + m_sData.token(";", 17) + ".bod", FILETYPE_SHIPSCENE);
-		if ( !m_pSceneFile )
+	if ( !m_pSceneFile ) {
-			return false;
+		return false;
+	}
 	m_pCockpitFile = this->ExtractFileToPackage(catFile, CyString("objects\\") + m_sData.token(";", 18) + ".pbd", FILETYPE_COCKPITSCENE, CyString("objects\\") + m_sData.token(";", 18) + ".bod");
-	if ( !m_pCockpitFile )
+	if ( !m_pCockpitFile ) m_pCockpitFile = this->ExtractFileToPackage(catFile, CyString("objects\\") + m_sData.token(";", 18) + ".bod", FILETYPE_COCKPITSCENE);
+	if ( !m_pCockpitFile && secondCat ) m_pCockpitFile = this->ExtractFileToPackage(secondCat, CyString("objects\\") + m_sData.token(";", 18) + ".pbd", FILETYPE_COCKPITSCENE, CyString("objects\\") + m_sData.token(";", 18) + ".bod");
-		m_pCockpitFile = this->ExtractFileToPackage(catFile, CyString("objects\\") + m_sData.token(";", 18) + ".bod", FILETYPE_COCKPITSCENE);
+	if ( !m_pCockpitFile && secondCat ) m_pCockpitFile = this->ExtractFileToPackage(secondCat, CyString("objects\\") + m_sData.token(";", 18) + ".bod", FILETYPE_COCKPITSCENE);
 	return true;
 }
-bool CXspFile::ExtractSceneFiles(CyString catFile)
+bool CXspFile::ExtractSceneFiles(CyString catFile, CyString secondCatFile)
+{
 	CCatFile cat;
-	if ( cat.Open(catFile, "", CATREAD_CATDECRYPT, false) == CATERR_NONE )
+	if ( cat.Open(catFile, "", CATREAD_CATDECRYPT, false) == CATERR_NONE ) {
+		CCatFile secondCat;
+		if ( !secondCatFile.Empty() ) {
+			if ( cat.Open(secondCatFile, "", CATREAD_CATDECRYPT, false) == CATERR_NONE ) {
+				return ExtractSceneFiles(&cat, &secondCat);
+			}
+		}
-		return ExtractSceneFiles(&cat);
+		return ExtractSceneFiles(&cat, NULL);
+	}
 	return false;
+}
 CyStringList *CXspFile::ReadSceneModels()
+{
 	if ( data && datasize )
+	{
 		if ( m_pSceneFile->CheckPackedExtension() )
 			data = UnPCKData(data, datasize, &datasize);
 	}
 	if ( !data || !datasize )
 		return NULL;
 	CyStringList *lModels = new CyStringList;
 				newline = true;
 			continue;
+		}
 		if ( newline )
 		{
 			if ( c == ' ' || c == 9 || c == '\n' || c == '\r' )
 				continue;
 			newline = false;
 		delete data;
 	return lModels;
+}
-void CXspFile::ExtractDummies(CCatFile *catFile, CyStringList *sceneModels, bool add)
+void CXspFile::ExtractDummies(CCatFile *catFile, CCatFile *secondCat, CyStringList *sceneModels, bool add)
+{
 	if ( !sceneModels ) return;
+	bool extracted = false;
-	if ( catFile->ExtractFile("types/dummies.pck", "tmp") )
+	if ( catFile->ExtractFile("types/dummies.pck", "tmp") ) extracted = true;
+	else if ( secondCat && secondCat->ExtractFile("types/dummies.pck", "tmp") ) extracted = true;
-	{
+	if ( extracted ) {
 		CFileIO File("tmp");
 		if ( File.Exists() )
+		{
 			CyString section;
 			int secCount = 0;
 	delete [] data;
 	return true;
+}
-void CXspFile::ExtractTextures(CCatFile *catFile)
+void CXspFile::ExtractTextures(CCatFile *catFile, CCatFile *secondCatFile)
+{
 	CyStringList lTextures;
 	for ( CListNode<C_File> *node = m_lFiles.Front(); node; node = node->next() )
+	{
 		this->GetTextureList(&lTextures, data, size);
+	}
 	for ( SStringList *node = lTextures.Head(); node; node = node->next )
+	{
-		if ( CFileIO(node->str).CheckFileExtension("dds") )
+		if ( CFileIO(node->str).CheckFileExtension("dds") ) {
-			this->ExtractFileToPackage(catFile, CyString(";dds\\";) + node->str, FILETYPE_SHIPOTHER);
+			if ( !this->ExtractFileToPackage(catFile, CyString(";dds\\";) + node->str, FILETYPE_SHIPOTHER) ) {
+				if ( secondCatFile ) this->ExtractFileToPackage(secondCatFile, CyString("dds\\") + node->str, FILETYPE_SHIPOTHER);
+			}
+		}
-		else
+		else {
-			this->ExtractFileToPackage(catFile, CyString(";textures\\";) + node->str, FILETYPE_SHIPOTHER);
+			if ( !this->ExtractFileToPackage(catFile, CyString(";textures\\";) + node->str, FILETYPE_SHIPOTHER) ) {
+				if ( secondCatFile ) this->ExtractFileToPackage(secondCatFile, CyString("textures\\") + node->str, FILETYPE_SHIPOTHER);
+			}
+		}
+	}
+}
 bool CXspFile::AddTextFromFile(CyString file, int textId)
+{
 			if ( node->str.Empty() )
 				node->remove = true;
 			else if ( node->str[0] == '/' )
 				node->remove = true;
 			else if ( !entries )
 			{
 				entries = node->str.GetToken(";", 2, 2).ToInt();
 				node->remove = true;
+			}
+		}
 		lines->RemoveMarked();
 		// now get all the entries from TShips
 		for ( int i = 0; i < 6; i++ )
+		{
 			int idx = m_sData.token(";", 32 + (i * 2));
 			if ( idx < lines->Count() && idx )
+			}
+		}
 		delete lines;
 		return true;
 	}
 	return false;
 }
-bool CXspFile::ExtractCockpits(CCatFile *catFile)
+bool CXspFile::ExtractCockpits(CCatFile *catFile, CCatFile *secondCatFile)
+{
-	if ( catFile->ExtractFile("types/TCockpits.pck", "tmp") )
+	bool extracted = catFile->ExtractFile("types/TCockpits.pck", "tmp");
+	if ( !extracted && secondCatFile ) extracted = secondCatFile->ExtractFile("types/TCockpits.pck", "tmp");
-	{
+	if ( extracted ) {
 		bool ret = this->ImportCockpits("tmp");
 		CFileIO("tmp").Remove();
 		return ret;
+	}
 	return false;
+}
-bool CXspFile::ExtractBodies(CCatFile *catFile, CyStringList *sceneModels)
+bool CXspFile::ExtractBodies(CCatFile *catFile, CCatFile *secondCatFile, CyStringList *sceneModels)
+{
 	if ( !sceneModels ) return false;
-	if ( catFile->ExtractFile("types/Bodies.pck", "tmp") )
+	bool extracted = catFile->ExtractFile("types/Bodies.pck", "tmp");
+	if ( !extracted && secondCatFile ) extracted = secondCatFile->ExtractFile("types/Bodies.pck", "tmp");
-	{
+	if ( extracted ) {
 		bool ret = this->ImportBodies(sceneModels, "tmp");
 		CFileIO("tmp").Remove();
 		return ret;
+	}
+	}
 	return false;
+}
-void CXspFile::ExtractTexts(CCatFile *catFile, int textId)
+void CXspFile::ExtractTexts(CCatFile *catFile, CCatFile *secondCatFile, int textId)
+{
 	for ( CListNode<SInCatFile> *node = catFile->GetFiles()->Front(); node; node = node->next() )
+	{
 		SInCatFile *f = node->Data();
 		if ( !f->sFile.Left(2).Compare("t\\") && !f->sFile.Left(2).Compare("t/") )
 			continue;
 		// extract the text file and read in the data
-		if ( catFile->ExtractFile(f->sFile, "tmp") )
+		bool extracted = catFile->ExtractFile(f->sFile, "tmp");
+		if ( !extracted && secondCatFile ) extracted = secondCatFile->ExtractFile(f->sFile, "tmp");
-		{
+		if ( extracted ) {
 			this->AddTextFromFile("tmp", textId);
 			CFileIO("tmp").Remove();
 		}
 	}
 }
-bool CXspFile::ProcessSceneFileSection(int section, CCatFile *catFile, CyStringList *lModels, CProgressInfo *progress)
+bool CXspFile::ProcessSceneFileSection(int section, CCatFile *catFile, CCatFile *secondCatFile, CyStringList *lModels, CProgressInfo *progress)
+{
 	if ( progress ) progress->UpdateStatus(section);
 	switch ( section )
+	{
 					if ( this->ExtractFileToPackage(catFile, CyString("objects\\") + node->str + ".pbb", FILETYPE_SHIPMODEL, CyString("objects\\") + node->str + ".bob") )
 						continue;
 					if ( this->ExtractFileToPackage(catFile, CyString("objects\\") + node->str + ".pbd", FILETYPE_SHIPMODEL, CyString("objects\\") + node->str + ".bod") )
 						continue;
 					if ( this->ExtractFileToPackage(catFile, CyString("objects\\") + node->str + ".bob", FILETYPE_SHIPMODEL) )
 						continue;
 					if ( this->ExtractFileToPackage(catFile, CyString("objects\\") + node->str + ".bod", FILETYPE_SHIPMODEL) )
 						continue;
+					if ( secondCatFile ) {
+						if ( this->ExtractFileToPackage(secondCatFile, CyString("objects\\") + node->str + ".pbb", FILETYPE_SHIPMODEL, CyString("objects\\") + node->str + ".bob") )
+							continue;
+						if ( this->ExtractFileToPackage(secondCatFile, CyString("objects\\") + node->str + ".pbd", FILETYPE_SHIPMODEL, CyString("objects\\") + node->str + ".bod") )
+							continue;
+						if ( this->ExtractFileToPackage(secondCatFile, CyString("objects\\") + node->str + ".bob", FILETYPE_SHIPMODEL) )
+							continue;
+						if ( this->ExtractFileToPackage(secondCatFile, CyString("objects\\") + node->str + ".bod", FILETYPE_SHIPMODEL) )
+							continue;
+					}
+				}
+			}
 			break;
 		case IMPORTSHIP_DUMMIES:
 			if ( !lModels ) return false;
-			this->ExtractDummies(catFile, lModels, true);
+			this->ExtractDummies(catFile, secondCatFile, lModels, true);
 			break;
 		// extract the textures
 		case IMPORTSHIP_TEXTURES:
-			this->ExtractTextures(catFile);
+			this->ExtractTextures(catFile, secondCatFile);
 			break;
 		case IMPORTSHIP_TEXTS:
 			// extract the text file entries
-			this->ExtractTexts(catFile, m_sData.token(";", 7));
+			this->ExtractTexts(catFile, secondCatFile, m_sData.token(";", 7));
 			break;
 		case IMPORTSHIP_BODIES:
 			// extract the bodies entries
 			if ( !lModels ) return false;
-			this->ExtractBodies(catFile, lModels);
+			this->ExtractBodies(catFile, secondCatFile, lModels);
 			break;
 		case IMPORTSHIP_COCKPITS:
 			// extract the cockpit entries
-			this->ExtractCockpits(catFile);
+			this->ExtractCockpits(catFile, secondCatFile);
 			break;
+	}
 	return true;
+}
-bool CXspFile::ProcessSceneFiles(CCatFile *catFile, CProgressInfo *progress)
+bool CXspFile::ProcessSceneFiles(CCatFile *catFile, CCatFile *secondCatFile, CProgressInfo *progress)
+{
 	// now lets parse our files
 	if ( progress ) progress->UpdateStatus(IMPORTSHIP_EXTRACTSCENE);
 	CyStringList *lModels = this->ReadSceneModels();
 	if ( !lModels )
 		return false;
 	// extract componants, and add extra items to list
-	if ( !this->ProcessSceneFileSection(IMPORTSHIP_COMPONANT, catFile, lModels, progress) )
+	if ( !this->ProcessSceneFileSection(IMPORTSHIP_COMPONANT, catFile, secondCatFile, lModels, progress) )
 		return false;
 	//lets first find any model files
-	if ( !this->ProcessSceneFileSection(IMPORTSHIP_MODELS, catFile, lModels, progress) )
+	if ( !this->ProcessSceneFileSection(IMPORTSHIP_MODELS, catFile, secondCatFile, lModels, progress) )
 		return false;
 	// extract the dummies
-	if ( !this->ProcessSceneFileSection(IMPORTSHIP_DUMMIES, catFile, lModels, progress) )
+	if ( !this->ProcessSceneFileSection(IMPORTSHIP_DUMMIES, catFile, secondCatFile, lModels, progress) )
 		return false;
 	// extract the textures
-	if ( !this->ProcessSceneFileSection(IMPORTSHIP_TEXTURES, catFile, lModels, progress) )
+	if ( !this->ProcessSceneFileSection(IMPORTSHIP_TEXTURES, catFile, secondCatFile, lModels, progress) )
 		return false;
 	// extract the text file entries
-	if ( !this->ProcessSceneFileSection(IMPORTSHIP_TEXTS, catFile, lModels, progress) )
+	if ( !this->ProcessSceneFileSection(IMPORTSHIP_TEXTS, catFile, secondCatFile, lModels, progress) )
 		return false;
 	// extract the bodies entries
-	if ( !this->ProcessSceneFileSection(IMPORTSHIP_BODIES, catFile, lModels, progress) )
+	if ( !this->ProcessSceneFileSection(IMPORTSHIP_BODIES, catFile, secondCatFile, lModels, progress) )
 		return false;
 	// extract the cockpit entries
-	if ( !this->ProcessSceneFileSection(IMPORTSHIP_COCKPITS, catFile, lModels, progress) )
+	if ( !this->ProcessSceneFileSection(IMPORTSHIP_COCKPITS, catFile, secondCatFile, lModels, progress) )
 		return false;
 	delete lModels;
 	return true;
+}
-bool CXspFile::ProcessSceneFiles(CyString catFile, CProgressInfo *progress)
+bool CXspFile::ProcessSceneFiles(CyString catFile, CyString secondCatFile, CProgressInfo *progress)
+{
 	CCatFile cat;
-	if ( cat.Open(catFile, "", CATREAD_CATDECRYPT, false) == CATERR_NONE )
+	if ( cat.Open(catFile, "", CATREAD_CATDECRYPT, false) == CATERR_NONE ) {
+		CCatFile secondCat;
+		if ( secondCat.Open(catFile, "", CATREAD_CATDECRYPT, false) == CATERR_NONE ) {
+			return ProcessSceneFiles(&cat, &secondCat, progress);
+		}
-		return ProcessSceneFiles(&cat, progress);
+		return ProcessSceneFiles(&cat, NULL, progress);
+	}
 	return false;
+}
 void CXspFile::PackAllFiles()

Subversion Repositories spk

(root)/libspk/src/XspFile.cpp – Rev 14 → 31