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

 	if ( !m_sDescription.Empty() )
 		return m_sDescription;
 	return this->GetShipName(lang);
+}
-bool CXspFile::StartExtractShip(CCatFile *catFile, CCatFile *secondCatFile, CyString id, CProgressInfo *progress)
+bool CXspFile::startExtractShip(CVirtualFileSystem *pVfs, const Utils::String &sId, CProgressInfo *pProgress)
+{
-	id.RemoveChar('\r');
+	m_sID = sId.removeChar('\r');
-	while ( id.Right(1) == ";" )
+	while ( m_sID.right(1) == ";" )
-		id.Truncate((int)id.Length() - 1);
-	m_sID = id.ToString();
+		m_sID.truncate(-1);
-	m_sData = catFile->GetTShipsEntry(id).ToString();
+	m_sData = pVfs->getTShipsEntry(m_sID);
 	// get scene files
-	if ( progress ) progress->UpdateStatus(IMPORTSHIP_SCENE);
+	if ( pProgress ) pProgress->UpdateStatus(IMPORTSHIP_SCENE);
-	if ( !this->ExtractSceneFiles(catFile, secondCatFile) )
+	if ( !this->extractSceneFiles(pVfs) )
 		return false;
 	return true;
+}
-bool CXspFile::StartExtractShip(CyString catFile, CyString secondCatFile, CyString id, CProgressInfo *progress)
-{
-	CCatFile cat;
-	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, NULL, id, progress);
-		}
-	}
-	return false;
-}
-bool CXspFile::ExtractShip(CCatFile *catFile, CyString id, CProgressInfo *progress)
+bool CXspFile::extractShip(CVirtualFileSystem *pVfs, const Utils::String &sId, CProgressInfo *progress)
+{
-	if ( !this->StartExtractShip(catFile, NULL, id, progress) )
+	if ( !this->startExtractShip(pVfs, sId, progress) )
 		return false;
 	// read the scene file and get the files list
-	if ( !this->ProcessSceneFiles(catFile, NULL, progress) )
+	if ( !this->processSceneFiles(pVfs, progress) )
 		return false;
 	// pack all the ship files
 	this->PackAllFiles();
 	return true;
-}
-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)
-{
-	if ( catFile->ExtractFile(file, "tmp") )
-	{
-		CFileIO File("tmp");
-		C_File *f = this->AddFile(CFileIO(addAs.Empty() ? file : addAs).GetFilename(), CFileIO(addAs.Empty() ? file : addAs).GetDir(), type);
-		if ( f )
-		{
-			if ( f->ReadFromFile("tmp") )
-			{
-				File.Remove();
-				return f;
-			}
-		}
-		File.Remove();
-	}
-	return NULL;
-}
-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 && 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 ) {
-		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 ) 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");
-	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, CyString secondCatFile)
+bool CXspFile::extractSceneFiles(CVirtualFileSystem *pVfs)
+{
-	CCatFile cat;
-	if ( cat.Open(catFile, ";", CATREAD_CATDECRYPT, false) == CATERR_NONE ) {
+	m_pSceneFile = pVfs->extractGameFileToPackage(this, "objects\\" + m_sData.token(";", 17) + ".pbd", FILETYPE_SHIPSCENE, "objects\\" + m_sData.token(";", 17) + ".bod";);
-		CCatFile secondCat;
-		if ( !secondCatFile.Empty() ) {
+	if ( !m_pSceneFile ) return false;
-			if ( cat.Open(secondCatFile, ";", CATREAD_CATDECRYPT, false) == CATERR_NONE ) {
+	m_pCockpitFile = pVfs->extractGameFileToPackage(this, "objects\\" + m_sData.token(";", 18) + ".pbd", FILETYPE_COCKPITSCENE, "objects\\" + m_sData.token(";", 18) + ".bod";);
-				return ExtractSceneFiles(&cat, &secondCat);
-			}
-		}
-		return ExtractSceneFiles(&cat, NULL);
-	}
-	return false;
+	return true;
+}
 CyStringList *CXspFile::ReadSceneModels()
+{
 	// read the scene file
 	if ( !m_pSceneFile )
 		m_pSceneFile = this->GetFirstFile(FILETYPE_SHIPSCENE);
 		memcpy(data, m_pSceneFile->GetData(), m_pSceneFile->GetDataSize());
 		deleteData = true;
+	}
 	if ( data && datasize )
 	{
 		if ( m_pSceneFile->CheckPackedExtension() )
 			data = UnPCKData(data, datasize, &datasize);
+	}
 	if ( !data || !datasize )
 		if ( !newline && !online )
+		{
 			if ( c == '\n' )
 				newline = true;
 			continue;
 		}
 		if ( newline )
+		{
 			if ( c == ' ' || c == 9 || c == '\n' || c == '\r' )
 				continue;
+		}
 		// this line is out model
 		else if ( online )
+		{
 			if ( c == 'B' || c == 'b' )
 			{
 				while(data[pos] == ' ') pos++;
 				unsigned char *line = (data + pos);
 				while(data[pos] != ';') pos++;
 				data[pos] = '\0';
 				lModels->PushBack((char *)line);
 				online = false;
+			}
+		}
+	}
 	if ( deleteData )
 		delete data;
 	return lModels;
+}
-void CXspFile::ExtractDummies(CCatFile *catFile, CCatFile *secondCat, CyStringList *sceneModels, bool add)
+void CXspFile::extractDummies(CVirtualFileSystem *pVfs, CyStringList *sceneModels, bool add)
+{
 	if ( !sceneModels ) return;
 	bool extracted = false;
-	if ( catFile->ExtractFile("types/dummies.pck", "tmp") ) extracted = true;
+	if ( pVfs->ExtractGameFile("types/dummies.pck", "tmp") ) {
-	else if ( secondCat && secondCat->ExtractFile("types/dummies.pck", "tmp") ) extracted = true;
-	if ( extracted ) {
 		CFileIO File("tmp");
 		if ( File.Exists() )
+		{
 			CyString section;
 			int secCount = 0;
 			File.Remove();
+		}
+	}
+}
-void CXspFile::ExtractComponants(CCatFile *catFile, CyStringList *sceneModels)
+void CXspFile::extractComponants(CVirtualFileSystem *pVfs, CyStringList *sceneModels)
+{
 	if ( !sceneModels ) return;
-	if ( catFile->ExtractFile("types/components.pck", "tmp") )
+	if ( pVfs->ExtractGameFile("types/components.pck", "tmp") )
+	{
 		CFileIO File("tmp");
 		if ( File.Exists() )
+		{
 			CyString file;
 	delete [] data;
 	return true;
+}
-void CXspFile::ExtractTextures(CCatFile *catFile, CCatFile *secondCatFile)
+void CXspFile::extractTextures(CVirtualFileSystem *pVfs)
+{
 	CyStringList lTextures;
 	for ( CListNode<C_File> *node = m_lFiles.Front(); node; node = node->next() )
+	{
 		if ( f->GetFileType() != FILETYPE_SHIPMODEL )
 			continue;
 		// cant do these yet
 		if ( f->CheckFileExt("pbb") || f->CheckFileExt("bob") )
 		{
 			if ( !f->BobDecompile() )
 				continue;
 		}
 		if ( !f->GetData() )
+		{
 			if ( !f->ReadFromFile() )
 				continue;
 		}
 		unsigned char *data = NULL;
 		size_t size;
 		if ( f->CheckFileExt("pbb") || f->CheckFileExt("pbd") )
 			data = f->UnPCKFile(&size);
 		else
+		{
 			data = f->GetData();
 			size = f->GetDataSize();
 		}
 		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") )
-			if ( !this-&gt;ExtractFileToPackage(catFile, CyString(";dds\\&quot;) + node->str, FILETYPE_SHIPOTHER) ) {
+			pVfs->extractGameFileToPackage(this, &quot;dds\\&quot; + Utils::String(node->str.ToString()), FILETYPE_SHIPOTHER);
-				if ( secondCatFile ) this->ExtractFileToPackage(secondCatFile, CyString("dds\\") + node->str, FILETYPE_SHIPOTHER);
-			}
-		}
-		else {
+		else
-			if ( !this-&gt;ExtractFileToPackage(catFile, CyString(";textures\\&quot;) + node->str, FILETYPE_SHIPOTHER) ) {
+			pVfs->extractGameFileToPackage(this, &quot;textures\\&quot; + Utils::String(node->str.ToString()), FILETYPE_SHIPOTHER);
-				if ( secondCatFile ) this->ExtractFileToPackage(secondCatFile, CyString("textures\\") + node->str, FILETYPE_SHIPOTHER);
-			}
-		}
+	}
+}
 bool CXspFile::AddTextFromFile(CyString file, int textId)
+{
 		return true;
+	}
 	return false;
+}
-bool CXspFile::ExtractCockpits(CCatFile *catFile, CCatFile *secondCatFile)
+bool CXspFile::extractCockpits(CVirtualFileSystem *pVfs)
+{
-	bool extracted = catFile-&gt;ExtractFile(&quot;types/TCockpits.pck", ";tmp");
+	if ( pVfs-&gt;ExtractGameFile(&quot;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, CCatFile *secondCatFile, CyStringList *sceneModels)
+bool CXspFile::extractBodies(CVirtualFileSystem *pVfs, CyStringList *sceneModels)
+{
 	if ( !sceneModels ) return false;
-	bool extracted = catFile-&gt;ExtractFile(&quot;types/Bodies.pck", ";tmp");
+	if ( pVfs-&gt;ExtractGameFile(&quot;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;
+}
 	if ( textId <= 0 )
 		return false;
 	CyString line;
 	if ( !id )
 		return false;
 	bool added = false;
 	CyString shipName;
 	CyString shipDesc;
 	int lang = 0;
 	bool inpage = false;
 			CFileIO("tmp").Remove();
+		}
+	}
+}
-bool CXspFile::ProcessSceneFileSection(int section, CCatFile *catFile, CCatFile *secondCatFile, CyStringList *lModels, CProgressInfo *progress)
+bool CXspFile::processSceneFileSection(int section, CVirtualFileSystem *pVfs, CyStringList *lModels, CProgressInfo *progress)
+{
 	if ( progress ) progress->UpdateStatus(section);
 	switch ( section )
+	{
 		case IMPORTSHIP_COMPONANT:
 			if ( !lModels ) return false;
-			this->ExtractComponants(catFile, lModels);
+			this->extractComponants(pVfs, lModels);
 			break;
 		case IMPORTSHIP_MODELS:
+			{
 				if ( !lModels ) return false;
 				for ( SStringList *node = lModels->Head(); node; node = node->next )
+				{
 					if ( node->str.IsNumber() ) // count be componants or dummy
 						continue;
-					if ( this->ExtractFileToPackage(catFile, CyString("objects\\") + node->str + ".pbb", FILETYPE_SHIPMODEL, CyString("objects\\") + node->str + ".bob") )
+					if ( pVfs->extractGameFileToPackage(this, "objects\\" + Utils::String(node->str.ToString()) + ".pbb", FILETYPE_SHIPMODEL, "objects\\" + Utils::String(node->str.ToString()) + ".bob") )
 						continue;
-					if ( this->ExtractFileToPackage(catFile, CyString("objects\\") + node->str + ".pbd", FILETYPE_SHIPMODEL, CyString("objects\\") + node->str + ".bod") )
+					if ( pVfs->extractGameFileToPackage(this, "objects\\" + Utils::String(node->str.ToString()) + ".pbd", FILETYPE_SHIPMODEL, "objects\\" + Utils::String(node->str.ToString()) + ".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, secondCatFile, lModels, true);
+			this->extractDummies(pVfs, lModels, true);
 			break;
 		// extract the textures
 		case IMPORTSHIP_TEXTURES:
-			this->ExtractTextures(catFile, secondCatFile);
+			this->extractTextures(pVfs);
 			break;
 		case IMPORTSHIP_TEXTS:
 			// extract the text file entries
-			this->ExtractTexts(catFile, secondCatFile, m_sData.token(";", 7));
+			pVfs->extractTexts(this, m_sData.token(";", 7));
 			break;
 		case IMPORTSHIP_BODIES:
 			// extract the bodies entries
 			if ( !lModels ) return false;
-			this->ExtractBodies(catFile, secondCatFile, lModels);
+			this->extractBodies(pVfs, lModels);
 			break;
 		case IMPORTSHIP_COCKPITS:
 			// extract the cockpit entries
-			this->ExtractCockpits(catFile, secondCatFile);
+			this->extractCockpits(pVfs);
 			break;
+	}
 	return true;
+}
-bool CXspFile::ProcessSceneFiles(CCatFile *catFile, CCatFile *secondCatFile, CProgressInfo *progress)
+bool CXspFile::processSceneFiles(CVirtualFileSystem *pVfs, 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, secondCatFile, lModels, progress) )
+	if ( !this->processSceneFileSection(IMPORTSHIP_COMPONANT, pVfs, lModels, progress) )
 		return false;
 	//lets first find any model files
-	if ( !this->ProcessSceneFileSection(IMPORTSHIP_MODELS, catFile, secondCatFile, lModels, progress) )
+	if ( !this->processSceneFileSection(IMPORTSHIP_MODELS, pVfs, lModels, progress) )
 		return false;
 	// extract the dummies
-	if ( !this->ProcessSceneFileSection(IMPORTSHIP_DUMMIES, catFile, secondCatFile, lModels, progress) )
+	if ( !this->processSceneFileSection(IMPORTSHIP_DUMMIES, pVfs, lModels, progress) )
 		return false;
 	// extract the textures
-	if ( !this->ProcessSceneFileSection(IMPORTSHIP_TEXTURES, catFile, secondCatFile, lModels, progress) )
+	if ( !this->processSceneFileSection(IMPORTSHIP_TEXTURES, pVfs, lModels, progress) )
 		return false;
 	// extract the text file entries
-	if ( !this->ProcessSceneFileSection(IMPORTSHIP_TEXTS, catFile, secondCatFile, lModels, progress) )
+	if ( !this->processSceneFileSection(IMPORTSHIP_TEXTS, pVfs, lModels, progress) )
 		return false;
 	// extract the bodies entries
-	if ( !this->ProcessSceneFileSection(IMPORTSHIP_BODIES, catFile, secondCatFile, lModels, progress) )
+	if ( !this->processSceneFileSection(IMPORTSHIP_BODIES, pVfs, lModels, progress) )
 		return false;
 	// extract the cockpit entries
-	if ( !this->ProcessSceneFileSection(IMPORTSHIP_COCKPITS, catFile, secondCatFile, lModels, progress) )
+	if ( !this->processSceneFileSection(IMPORTSHIP_COCKPITS, pVfs, lModels, progress) )
 		return false;
 	delete lModels;
 	return true;
+}
-bool CXspFile::ProcessSceneFiles(CyString catFile, CyString secondCatFile, CProgressInfo *progress)
-{
-	CCatFile cat;
-	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, NULL, progress);
-	}
-	return false;
-}
 void CXspFile::PackAllFiles()
 {
 	for ( CListNode<C_File> *node = m_lFiles.Front(); node; node = node->next() )
+	{
 		C_File *f = node->Data();
 		if ( f->GetFileType() == FILETYPE_SHIPSCENE || f->GetFileType() == FILETYPE_COCKPITSCENE || f->GetFileType() == FILETYPE_SHIPMODEL || f->GetFileType() == FILETYPE_SHIPOTHER )
+		{
 			if ( f->CheckFileExt("bod") )
 			{
 				if ( f->PCKFile() )
 					f->ChangeFileExt("pbd");
+			}
 			else if ( f->CheckFileExt("bob") )
 			{
 				if ( f->PCKFile() )
 					f->ChangeFileExt("pbb");
+			}
+		}
+	}
 		for ( int i = 0; i < 6; i++ )
+		{
 			CyString tId = m_sData.token(";", 32 + (i * 2));
 			if ( tId.IsNumber() && tId.ToInt() == c->iIndex )
 				m_sData = m_sData.replaceToken(";", 32 + (i * 2), (id + "(" + CyString::Number(c->iIndex) + ")").c_str());
 		}
 	}
+}
 CyString CXspFile::FormatShipData(CyStringList *cockpits, int *text, int game)
+{
 	CyString data = (game == GAME_X3) ? this->GetX3ShipData() : this->GetTCShipData();
 	if ( data.Right(1) != ";" )
 		data += ";";
 	return data;
+}

Subversion Repositories spk

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