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



{
	bool oldPlugin = false;
 
	dir = dir.FindReplace("\\", "/");
	CFileIO datFile(dir + "/PluginManager/pluginmanager.dat");
	if ( datFile.exists() )
	{
		std::vector<CyString> *readFile = datFile.ReadLines();
		if ( readFile )
		{
			for ( int i = 0; i < (int)readFile->size(); i++ )

 
	m_bVanilla = true;
 
	// check the pluginmanager data file exists
	CFileIO datFile(m_sCurrentDir + "/PluginManager/pluginmanager.dat");
	if ( datFile.exists() )
	{
		std::vector<CyString> *readFile = datFile.ReadLines();
		if ( readFile )
		{
			float fVersion = 0;

					uf->SetFilename(m_sCurrentDir + "/Scripts/" + rest.GetToken(" ", 2));
					m_lUninstallFiles.push_back(uf);
				}
				else if ( cmd == "NonRemovedFile" )
				{
					if ( !CFileIO::Remove(rest.ToString()) )
						m_lNonRemovedFiles.PushBack(rest);
				}
				else if ( cmd == "Original" )
				{
					C_File *uf = new C_File();

 
void CPackages::RemoveCreatedFiles()
{
	for ( SStringList *node = m_lCreatedFiles.Head(); node; node = node->next )
	{
		if ( CFileIO(node->str).ExistsOld() )
			CFileIO::Remove(node->str.ToString());
		else if ( CFileIO(m_sCurrentDir + "/" + node->str).ExistsOld() )
			CFileIO::Remove((m_sCurrentDir + "/" + node->str).ToString());
	}
 
	m_lCreatedFiles.Clear();
}
 
void CPackages::PurgeGameObjects()
{
	// check for the log file
	CyString logDir = GetLogDirectory();
	CFileIO LogFile(logDir + "/log0" + CyString::Number(PMTEXTFILE).PadNumber(4) + ".txt");
	if ( LogFile.exists() )
	{
		// read the log file to memory
		std::vector<CyString> *lines = LogFile.ReadLines();
		if ( lines )
		{

			}
 
			delete lines;
		}
		// remove the log file
		LogFile.remove();
	}
}
 
void CPackages::PurgeWares()
{

}
 
bool CPackages::ReadyFakePatch()
{
	// already exists, lets skip it
	if ( CFileIO(m_sCurrentDir + "/PluginManager/PlugMan_Fake.cat").ExistsOld() && CFileIO(m_sCurrentDir + "/PluginManager/PlugMan_Fake.dat").ExistsOld() )
		return true;
 
	// if only one of them exists, lets remove them
	if ( CFileIO(m_sCurrentDir + "/PluginManager/PlugMan_Fake.cat").ExistsOld() )
		CFileIO::Remove(m_sCurrentDir.ToString() + "/PluginManager/PlugMan_Fake.cat");
	if ( CFileIO(m_sCurrentDir + "/PluginManager/PlugMan_Fake.dat").ExistsOld() )
		CFileIO::Remove(m_sCurrentDir.ToString() + "/PluginManager/PlugMan_Fake.dat");
 
	// now lets find the fake patch
	CyString useFile;
	if ( m_iFakePatch > 0 )
	{

 
			// no files, jsut delete them
			CFileIO catFile(m_sCurrentDir + "/" + useFile + ".cat");
			if ( !files || !found )
			{
				if ( catFile.remove() )
				{
					CFileIO datFile(m_sCurrentDir + "/" + useFile + ".dat");
					if ( datFile.remove() )
						return true;
				}
			}
			else
			{

bool CPackages::CheckIfPluginManagerFile(CyString filename)
{
	bool found = false;
 
	CFileIO catFile(m_sCurrentDir + "/" + filename + ".cat");
	if ( catFile.exists() && CFileIO(m_sCurrentDir + "/" + filename + ".dat").ExistsOld() )
	{
		CCatFile openFile;
		if ( openFile.Open(catFile.GetFullFilename(), this->GetAddonDir(), CATREAD_CATDECRYPT, false) == CATERR_NONE )
		{
			int count = 0;

{
	bool found = false;
 
	// both the cat file and dat file exists, lets open it
	CFileIO catFile(m_sCurrentDir + "/" + filename + ".cat");
	if ( catFile.exists() && CFileIO(m_sCurrentDir + "/" + filename + ".dat").ExistsOld() )
	{
		CCatFile openFile;
		if ( openFile.Open(catFile.GetFullFilename(), this->GetAddonDir(), CATREAD_CATDECRYPT, false) == CATERR_NONE )
		{
			if ( openFile.FindData("PlugMan\\TFake.pck") )

}
 
int CPackages::CheckOpenPackage(CyString file, int *error)
{
	// first check if it exists
	if ( !CFileIO(file).ExistsOld() )
	{
		*error = INSTALLERR_NOEXIST;
		return -1;
	}
 

			CLog::logf(CLog::Log_Install, 4, "File: %s", f->Data()->GetFilePointer().c_str());
			if ( f->Data()->GetFileType() != FILETYPE_SHIPSCENE && f->Data()->GetFileType() != FILETYPE_COCKPITSCENE && f->Data()->GetFileType() != FILETYPE_SHIPMODEL && f->Data()->GetFileType() != FILETYPE_SHIPOTHER ) {
				CLog::logf(CLog::Log_Install, 4, "Not a valid file type to add to fake patch (%d)", f->Data()->GetFileType());
				continue;
			}
			CLog::logf(CLog::Log_Install, 4, "checking addon dir");
			if ( CCatFile::IsAddonDir(f->Data()->GetNameDirectory(pPackage)) ) {
				CLog::logf(CLog::Log_Install, 4, "Is an addon directory, skipping, %s", f->Data()->GetNameDirectory(pPackage).c_str());
				continue;
			}
			// check if its already in the fake patch
			CLog::logf(CLog::Log_Install, 4, "checking full dir");
			if ( f->Data()->GetFullDir().IsIn("::") ) {
				CLog::logf(CLog::Log_Install, 4, "Is already in a mod file, skipping, %s", f->Data()->GetNameDirectory(pPackage).c_str());
				continue;
			}
			Utils::String toFile;
			CLog::logf(CLog::Log_Install, 2, "Adding file: %s into the fake patch", f->Data()->GetNameDirectory(pPackage).c_str());
			CLog::logf(CLog::Log_Install, 4, "Cat File: %s", cat.GetCatFilename().c_str());
 
			Utils::String sFilename = f->Data()->GetFilePointer().ToString();
			CLog::logf(CLog::Log_Install, 4, "- Filename: %s", sFilename.c_str());
			Utils::String sTo = f->Data()->GetNameDirectory(pPackage).ToString();
			CLog::logf(CLog::Log_Install, 4, "- To: %s", sTo.c_str());
			if ( cat.AppendFile(sFilename, sTo, true, (m_iGameFlags & EXEFLAG_NOXOR) ? false : true, &toFile) ) {
				CLog::logf(CLog::Log_Install, 3, "Removing old file, %s", f->Data()->GetFilePointer().c_str());
				CFileIO::Remove(f->Data()->GetFilePointer().ToString());
				CLog::logf(CLog::Log_Install, 3, "Adjusting file pointer to fake patch, %s => %s", f->Data()->GetFilePointer().c_str(), (m_sCurrentDir + "/PluginManager/PlugMan_Fake.cat::" + toFile).c_str());
				f->Data()->SetFilename(m_sCurrentDir + "/PluginManager/PlugMan_Fake.cat::" + toFile);
			}
		}
	}

						if ( catTo.Open(findMatching->GetFilePointer(), this->GetAddonDir(), CATREAD_CATDECRYPT, false) == CATERR_NONE )
						{
							for ( int i = 0; i < catFrom.GetNumFiles(); i++ )
							{
								SInCatFile *c = catFrom.GetFile(i);								 
								catTo.AppendFile((f->Data()->GetFilePointer() + "::" + c->sFile).ToString(), c->sFile.ToString());
							}
						}
					}
 
					// now remove the files

		{
			// check if its an original file and restore
			if ( IsOriginalFile(f) )
			{
				CFileIO of(m_sCurrentDir + "/PluginManager/Original/" + f->GetNameDirectory(NULL));
				if ( of.exists() )
				{
					original = true;
					if ( of.Rename(m_sCurrentDir + "/" + f->GetNameDirectory(NULL)) )
						this->AddLogEntry(SPKINSTALL_ORIGINAL_RESTORE, f->GetNameDirectory(NULL), errors);
					else

			CyString newFilename = m_sCurrentDir + "/" + newFile->GetNameDirectory(NULL);
			CFileIO file(uf->GetFilePointer());
 
			if ( uf->GetUsed() )
			{
				if ( file.copy(newFilename.ToString()) )
					this->AddLogEntry(SPKINSTALL_UNINSTALL_COPY, newFile->GetNameDirectory(NULL), errors);
				else
				{
					this->AddLogEntry(SPKINSTALL_UNINSTALL_COPY_FAIL, newFile->GetNameDirectory(NULL), errors);
					delete newFile;

	if ( m_bRenameText )
		CreateLanguageTextFiles(errors);
 
	this->BackupSaves();
 
	if ( CFileIO(m_sCurrentDir + "/mods/PluginManager.dat").ExistsOld() )
		CFileIO::Remove(m_sCurrentDir.ToString() + "/mods/PluginManager.dat");
	if ( CFileIO(m_sCurrentDir + "/mods/PluginManager.cat").ExistsOld() )
		CFileIO::Remove(m_sCurrentDir.ToString() + "/mods/PluginManager.cat");
 
	if ( !m_bVanilla )
	{
		// base mode for Reunion
		if ( m_iGame == GAME_X3 && m_pEnabledMod )

				while ( fCat && !fCat->IsFakePatch() && !fCat->CheckFileExt("cat") && !fCat->GetBaseName().Compare(fDat->GetBaseName()) )
					fCat = m_pEnabledMod->GetNextFile(fCat);
 
				if ( fCat )
				{
					CFileIO(fDat->GetFilePointer()).copy(m_sCurrentDir.ToString() + "/mods/PluginManager.dat");
					CFileIO(fCat->GetFilePointer()).copy(m_sCurrentDir.ToString() + "/mods/PluginManager.cat");
				}
			}
		}
		else if ( m_iGame == GAME_X3 && !m_sSetMod.Empty() && CFileIO(m_sCurrentDir + "/mods/" + m_sSetMod + ".cat").ExistsOld() && CFileIO(m_sCurrentDir + "/mods/" + m_sSetMod + ".dat").ExistsOld() )
		{
			CFileIO(m_sCurrentDir + "/mods/" + m_sSetMod + ".dat").copy(m_sCurrentDir.ToString() + "/mods/PluginManager.dat");
			CFileIO(m_sCurrentDir + "/mods/" + m_sSetMod + ".cat").copy(m_sCurrentDir.ToString() + "/mods/PluginManager.cat");
		}
 
		if ( !CDirIO(m_sCurrentDir).Exists("mods") )
			CDirIO(m_sCurrentDir).Create("mods");
 

 
	CFileIO catFile(m_sCurrentDir + "/PluginManager/PlugMan_Fake.cat");
	CFileIO datFile(m_sCurrentDir + "/PluginManager/PlugMan_Fake.dat");
 
	// if only 1 exists, remove it
	if ( catFile.exists() && !datFile.exists() ) {
 
		if ( !catFile.remove() ) return false;
 
	}
	else if ( !catFile.exists() && datFile.exists() ) {
 
		if ( !datFile.remove() ) return false;
 
	}
 
	// if both exists, lets rename them
	if ( catFile.exists() && datFile.exists() )
	{
		// we need to add the plugin manager file in
		CyString file = m_sTempDir;
		if ( !file.Empty() )
			file += "/";

		fakeFile.WriteFile(&lines);
 
		CCatFile fakePatch;
		if ( fakePatch.Open(m_sCurrentDir + "/PluginManager/PlugMan_Fake.cat", this->GetAddonDir(), CATREAD_DAT, false) == CATERR_NONE )
		{
			if ( fakePatch.AppendFile(file.ToString(), "PlugMan\\TFake.pck") )
			{
				// find next available fake patch
				m_iFakePatch = this->FindNextFakePatch();
 
				CyString filename = CyString::Number(m_iFakePatch).PadNumber(2);
				if ( catFile.Rename(m_sCurrentDir + "/" + filename + ".cat") )
				{
					if ( datFile.Rename(m_sCurrentDir + "/" + filename + ".dat") ){
 
						fakeFile.remove();
						return true;
					}
 
					// TODO: restore cat file
				}
			}
		}
 
		fakeFile.remove();
		return false;
	}
 
	return true;
}

		// check if theres an original file to backup
		C_File *of = GetOriginalFile(f);
		if ( of )
		{
			// check if the orignal file is already backed up
			if ( !CFileIO(m_sCurrentDir + "/PluginManager/Original/" + f->GetNameDirectory(package)).ExistsOld() )
			{
				// lets back up the file now
				BackupOriginalFile(of, errors);
			}
		}

 
		// lets actually move the file back now
		// !!error checking!!
		CFileIO currentFile(f->GetFilePointer());
		CFileIO newFile(m_sCurrentDir + "/" + newFilename);
		if ( !currentFile.exists() )
		{
			// missing file ??
			if ( !newFile.exists() )
			{
				this->AddLogEntry(SPKINSTALL_MISSINGFILE, newFilename, errors);
				continue;
			}
		}
		// remove existing file
		// file exists, so lets try to move it
		else
		{
			if ( newFile.exists() )
				newFile.remove();
 
			if ( !currentFile.Rename(newFile.GetFullFilename()) )
			{
				this->AddLogEntry(SPKINSTALL_ENABLEFILE_FAIL, newFilename, errors);
				continue;

 
		// now to move the file by renameing it to its new location
		// !!error checking!!
		// check the file, if it doesn't exist, and exists as disabled, we should just adjust the setting instead of an error
		CFileIO currentFile(f->GetFilePointer());
		if ( !currentFile.exists() )
		{
			if ( !CFileIO(newFilename).exists() )
			{
				this->AddLogEntry(SPKINSTALL_MISSINGFILE, f->GetNameDirectory(checkPackage), errors);
				continue;
			}
		}

 
		// check if its an original file and restore
		if ( IsOriginalFile(f) )
		{
			CFileIO of(m_sCurrentDir + "/PluginManager/Original/" + f->GetNameDirectory(checkPackage));
			if ( of.exists() )
			{
				original = true;
				if ( of.Rename(m_sCurrentDir + "/" + f->GetNameDirectory(checkPackage)) )
					this->AddLogEntry(SPKINSTALL_ORIGINAL_RESTORE, f->GetNameDirectory(checkPackage), errors);
				else

 * Removes a single uninstall file
 */
bool CPackages::RemoveUninstallFile(C_File *file, CyStringList *errors)
{
	CFileIO fio(file->GetFilePointer());
	if ( fio.exists() )
	{
		if ( fio.remove() ) {
 
			this->AddLogEntry(SPKINSTALL_UNINSTALL_REMOVE, file->GetNameDirectory(NULL), errors);
			return true;
		}
		else if ( errors )
			this->AddLogEntry(SPKINSTALL_UNINSTALL_REMOVE_FAIL, file->GetNameDirectory(NULL), errors);

 * Removes a single file
 */
bool CPackages::RemoveSharedFile(C_File *file, CyStringList *errors)
{
	CFileIO fio(file->GetFilePointer());
	if ( fio.exists() )
	{
		if ( fio.remove() ) {
 
			this->AddLogEntry(SPKINSTALL_SHARED, file->GetNameDirectory(NULL), errors);
			delete file;
			return true;
		}
		else if ( errors )

		this->AddLogEntry(SPKINSTALL_CREATEDIRECTORY, newDir, errors);
	}
 
	// now lets copy the file
	CFileIO CopyFile(f->GetFilePointer());
	if ( CopyFile.copy(oDir.File(newDir + "/" + f->GetFilename()).ToString()) )
	{
		CLog::logf(CLog::Log_Install, 2, "Original file: %s has been backed up", f->GetNameDirectory(NULL).c_str());
		this->AddLogEntry(SPKINSTALL_ORIGINAL_BACKUP, f->GetNameDirectory(NULL), errors);
		return true;
	}

				// check its filename, it might already be in the correct place
				if ( lowestFile->GetBaseName().ToInt() != lowest )
				{
					// if the file already exists, we need to move it elsewhere
					CyString nextName = CyString::Number(lowest).PadNumber(2);
					if ( CFileIO(m_sCurrentDir + "/" + nextName + ".cat").ExistsOld() )
					{
						// find the file in our internal file list
						C_File *moveFile = FindFile(FILETYPE_MOD, nextName + ".cat");
						if ( !moveFile ) // must not have it in our list ? lets move to the next
						{

	CyString remFileStr = file->GetFilePointer();
	remFileStr.FindReplace(m_sCurrentDir, "");
 
	if ( file->GetFilePointer().IsIn("::") ) {
		CFileIO CatFile(file->GetFilePointer().GetToken("::", 1, 1));
		if ( CatFile.exists() ) {
			CCatFile cat;
			if ( cat.Open(CatFile.GetFullFilename(), this->GetAddonDir(), CATREAD_DAT, false) == CATERR_NONE ) {
				CyString fileName = file->GetFilePointer().GetToken("::", 2, 2);
				if ( cat.FindData(fileName) ) {
					if ( cat.RemoveFile(fileName) ) {

			}
		}
	}
	else {
		CFileIO f(file->GetFilePointer());
		if ( f.exists() )
		{
 
			if ( f.remove() ) this->AddLogEntry(SPKINSTALL_DELETEFILE, remFileStr, errors);
			else if ( errors )
			{
				this->AddLogEntry(SPKINSTALL_DELETEFILE_FAIL, remFileStr, errors);
				return false;
			}

			progress->UpdateProgress(files, max);
		++files;
 
		C_File *f = oNode->Data();
		CFileIO of(m_sCurrentDir + "/PluginManager/Original/" + f->GetNameDirectory(NULL));
		if ( of.exists() )
			of.Rename(m_sCurrentDir + "/" + f->GetNameDirectory(NULL));
 
		//RemoveFile(oNode->Data());
		delete oNode->Data();
	}

	m_gameExe.Reset();
 
	CyString exeFile = this->FindDataDir(dir, "exe");
 
	// if file exists, read it, otherwise, just add
	if ( !exeFile.Empty() && CFileIO(exeFile).ExistsOld() )
		m_gameExe.ReadFile(exeFile);
	else
	{
		m_gameExe.ParseExe("x2.exe:5:NOSAVESUBDIR:HKCU/Software/EgoSoftware/X2/ModName:X2 The Threat:!GAMEDIR!:2:1604608!2150400:1.4 Artifical Life:1974272:1.5 Uplink");
		m_gameExe.ParseExe("x3.exe:5:0:HKCU/Software/Egosoft/X3/ModName:X3 Reunion:Egosoft/X3:2:2347008:2.0 Bala Gi:2367488!2375680:2.5 Uplink");

			}
		}
	}
	else if ( !m_sSetMod.Empty() )
	{
		if ( CFileIO(m_sCurrentDir + "/mods/" + m_sSetMod + ".cat").ExistsOld() )
		{
			CCatFile catFile;
			if ( catFile.Open(m_sCurrentDir + "/mods/" + m_sSetMod + ".cat", addonDir, CATREAD_CATDECRYPT, false) == CATERR_NONE )
			{
				if ( catFile.ExtractFile(aFilename, aTo) )

		}
	}
 
	// find the highest cat number
	int catNumber = 1;
	while ( CFileIO(dir + "/" + CyString::Number(catNumber).PadNumber(2) + ".cat").ExistsOld() && catNumber < 99 )
		++catNumber;
 
	// get the last one, not the next free one
	--catNumber;
 

		wareFile += (char)UPPER(wareType);
 
		CyString openFile;
 
		int e;
		if ( i == WARES_TECH && CFileIO(m_sTempDir + "/TWareT.txt").ExistsOld() )
			openFile = m_sTempDir + "/TWareT.txt";
		else {
			e = ExtractGameFile(CyString("types/") + wareFile + ".pck", m_sTempDir + "/" + wareFile + ".txt");
			if ( e == 1 )
				openFile = m_sTempDir + "/" + wareFile + ".txt";

					wareLines.PushFront(CyString("// Created by SPKInstaller Libraries V") + strV, NullString);
					if ( readFile.WriteFile(&wareLines) )
						this->PackFile(&readFile, CyString("types\\") + wareFile + ".pck");
				}
			}
			readFile.remove();
		}
	}
}
 
void CPackages::CreateEMPFile(CyString progDir)

			CFileIO pckFile(m_sCurrentDir + "/t/" + filename + ".pck");
			pckFile.WriteData((char *)pckData, newFileSize);
			this->AddCreatedFile(pckFile.GetFullFilename());
		}
	}
	textFile.remove();
}
 
bool CPackages::IsCurrentDir(CyString dir)
{
	if ( dir.Compare(m_sCurrentDir) )

			CFileIO File(saveDir.File(node->str));
			if ( !File.CheckFileExtension("sav") )
				continue;
			// remove the file if already exists
			if ( gameSaveDir.Exists(node->str) )
				CFileIO::Remove(gameSaveDir.File(node->str).ToString());
 
			// copy the file into the games save dir for backup
			File.copy(gameSaveDir.File(File.GetFilename()).ToString(), true);
		}
 
		delete dirs;
	}
 

	{
		for ( SStringList *node = dirs->Head(); node; node = node->next )
		{
			CFileIO File(restoreDir.File(node->str));
			// remove the file if already exists
 
			if ( toDir.Exists(node->str) ) CFileIO::Remove(toDir.File(node->str).ToString());
 
			// move file over
			File.copy(toDir.File(node->str).ToString(), true);
		}
 
		delete dirs;
	}
 

	Dir.RemoveDir("objects", false, true, 0);
	Dir.RemoveDir("types", false, true, 0);
	Dir.RemoveDir("textures", false, true, 0);
 
	// remove the plugin manager mod files
 
	if ( Dir.Exists("mods/PluginManager.cat") )	CFileIO::Remove(Dir.File("mods/PluginManager.cat").ToString());
 
	if ( Dir.Exists("mods/PluginManager.dat") )	CFileIO::Remove(Dir.File("mods/PluginManager.dat").ToString());
 
	return true;
}
 
void CPackages::CreateDummies()

				}
 
				delete lines;
			}
 
			File.remove();
		}
 
		// add the new entries for the ships
		for ( CListNode<SGameShip> *node = m_lGameShips.Front(); node; node = node->next() )
		{

		// write the file to disk
		CFileIO WriteFile(m_sTempDir + "/dummies.txt");
		if ( WriteFile.WriteFile(&lines) )
		{
			this->PackFile(&WriteFile, "types\\dummies.pck");
			WriteFile.remove();
		}
	}
}
 
void CPackages::CreateCutData()

				}
 
				delete lines;
			}
 
			File.remove();
		}
	}
 
	for ( CListNode<SGameShip> *node = m_lGameShips.Front(); node; node = node->next() )
	{

	// write the file to disk
	CFileIO WriteFile(m_sTempDir + "/CutData.txt");
	if ( WriteFile.WriteFile(&cutList) )
	{
		this->PackFile(&WriteFile, "types\\CutData.pck");
		WriteFile.remove();
	}
}
 
void CPackages::CreateAnimations()
{

				}
 
				delete lines;
			}
 
			File.remove();
		}
	}
 
	CyStringList parsedAniList;
	CXspFile::ReadAnimations(&aniList, &parsedAniList, 0);

	// write the file to disk
	CFileIO WriteFile(m_sTempDir + "/Animations.txt");
	if ( WriteFile.WriteFile(&formatedAniList) )
	{
		this->PackFile(&WriteFile, "types\\Animations.pck");
		WriteFile.remove();
	}
}
 
void CPackages::CreateBodies()
{

					}
				}
 
				delete lines;
			}
			File.remove();
		}
	}
 
	// lets now add any new entries
	for ( CListNode<SGameShip> *node = m_lGameShips.Front(); node; node = node->next() )

	// write the file to disk
	CFileIO WriteFile(m_sTempDir + "/Bodies.txt");
	if ( WriteFile.WriteFile(&writeList) )
	{
		this->PackFile(&WriteFile, "types\\Bodies.pck");
		WriteFile.remove();
	}
}
 
void CPackages::CreateCustomStarts()
{

				// create a maps files
				int e = this->ExtractGameFile(str->data + ".pck", m_sTempDir + "/" + str->data + ".pck");
				if ( e )
				{
					CFileIO File((e == -1) ? (str->data + ".pck") : (m_sTempDir + "/" + str->data + ".pck"));
					if ( File.exists() )
					{
						File.Rename(m_sCurrentDir + "/" + dir + "/" + str->str + ".pck");
						this->AddCreatedFile(dir + "/" + str->str + ".pck");
					}
				}

				}
 
				delete lines;
			}
 
			File.remove();
		}
 
		// add the new entries for the ships
		for ( CListNode<SGameShip> *node = m_lGameShips.Front(); node; node = node->next() )
		{

		// write the file to disk
		CFileIO WriteFile(m_sTempDir + "/Components.txt");
		if ( WriteFile.WriteFile(&lines) )
		{
			this->PackFile(&WriteFile, "types\\Components.pck");
			WriteFile.remove();
		}
	}
}
 
bool CPackages::ReadGlobals(CyStringList &globals)
{
	int e = ExtractGameFile("types/Globals.pck", m_sTempDir);
	if ( e )
	{
		CFileIO File(((e == -1) ? "." : m_sTempDir) + "/Globals.txt");
		if ( File.exists() )
		{
			CyStringList *lines = File.ReadLinesStr();
			if ( lines )
			{
				int entries = -1;

 
		CFileIO WriteFile(m_sTempDir + "/Globals.txt");
		if ( WriteFile.WriteFile(&writeList) )
		{
			this->PackFile(&WriteFile, "types/Globals.pck");
			WriteFile.remove();
		}
	}
}
 
void CPackages::CreateTShips()

 
				delete lines;
 
			}
 
			File.remove();
 
			// assign the ship buffer
			if ( !m_iShipBuffer )
				m_iShipBuffer = tshipsList.Count() + 15;
			// there seems to be too many additional entries, we have no choise but to change the buffer

 
			CFileIO WriteFile(m_sTempDir + "/TShips.txt");
			if ( WriteFile.WriteFile(&tshipsList) )
			{
				this->PackFile(&WriteFile, "types/TShips.pck");
				WriteFile.remove();
			}
		}
	}
 
}

			if ( checkxml )
			{
				int readmaxlines = 20;
				bool isxml = false;
				do {
					CyString line = pckFile.readEndOfLine();
					if ( line.IsIn("<language id=") )
					{
						isxml = true;
						break;
					}

						break;
					}
					--readmaxlines;
					if ( readmaxlines <= 0 )
						break;
				} while (pckFile.isOpened());
 
				if ( pckFile.isOpened() )
					pckFile.StopRead();
 
				if ( isxml )
					pckFile.Rename(pckFile.ChangeFileExtension("xml"));
			}

		CCatFile catFile;
		int error = catFile.Open(m_sCurrentDir + "/mods/PluginManager.cat", this->GetAddonDir(), CATREAD_CATDECRYPT, true);
		if ( error == CATERR_NONE || error == CATERR_CREATED )
		{
			// it it wrote ok, remove the old ones
			if ( !catFile.AppendFile(File->GetFullFilename().ToString(), filename.ToString(), true, true) )
				return false;
			return true;
		}
	}
	else

				}
 
				delete lines;
			}
 
			File.remove();
		}
 
		// now add the new ones
		for ( CListNode<SGameShip> *node = m_lGameShips.Front(); node; node = node->next() )
		{

 
		CFileIO WriteFile(m_sTempDir + "/TCockpits.txt");
		if ( WriteFile.WriteFile(cockpitList) )
		{
			this->PackFile(&WriteFile, "types\\TCockpits.pck");
			WriteFile.remove();
		}
 
		// remove those entrys
		cockpitList->PopFront();
		cockpitList->PopFront();

}
 
CBaseFile *CPackages::LoadPackagerScript(CyString filename, int compression, CyString (*askFunc)(CyString), CyStringList *malformedLines, CyStringList *unknownCommands, CyStringList *variables)
{
	// check the file exists
	if ( !CFileIO(filename).ExistsOld() )
		return NULL;
 
	// read all the lines
	CFileIO File(filename);
	std::vector<CyString> *lines = File.ReadLines();

 
	// write a file, then read the contents
	CFileIO File(dir + "/accessrightscheck.dat");
 
	// check if file exists and remove it
	if ( File.exists() )
	{
		// if we cant remove it, we dont have enough rights
		if ( !File.remove() )
			return false;
 
		// if its still there, we dont have enough rights
		if ( File.exists() )
			return false;
	}
 
	// now create the file
	if ( !File.WriteString("testing access rights") )
		return false;
 
	// now check it exists
	if ( !File.exists() )
		return false;
 
	// now read the file for the correct contents
	CyStringList *lines = File.ReadLinesStr();
	if ( !lines )

		deleteFile = true;
	}
	else
		File.Open(file);
 
	if ( !File.exists() )
		return false;
 
	bool ret = false;
	CyStringList *lines = File.ReadLinesStr();
	if ( lines )

		delete lines;
		ret = true;
	}
 
	if ( deleteFile )
		File.remove();
 
	return ret;
}
 
CyString CPackages::ReadShipData(CyString file, CyString id)

		deleteFile = true;
	}
	else
		File.Open(file);
 
	if ( !File.exists() )
		return false;
 
	// open and read file
	CyStringList *lines = File.ReadLinesStr();
	if ( !lines )

 
void CPackages::RemoveFailedFiles()
{
	for ( SStringList *str = m_lNonRemovedFiles.Head(); str; str = str->next )
	{
		if ( CFileIO::Remove(str->str.ToString()) )
			str->remove = true;
	}
 
	m_lNonRemovedFiles.RemoveMarked();
}

	}
	
	for ( CListNode<C_File> *fNode = newFile->GetFileList()->Front(); fNode; fNode = fNode->next() )
	{
		C_File *f = fNode->Data();
		CFileIO::Remove(f->GetFilePointer().ToString());
		f->SetFullDir("");
	}
 
	return count;
}

			error = true;
			break;
		}
 
		CFileIO File(fileName);
		if ( File.exists() )
		{
			if ( fileName.Compare("pluginmanager.txt") )
				this->ReadArchiveData(File.GetFullFilename(), archive);
			else
			{

				else
					f = archive->AddFile(CFileIO(fileName).GetFilename(), extradir, type);
				f->ReadFromFile(File.GetFullFilename());
			}
 
			File.remove();
		}
	}
 
	RARCloseArchive(hArcData);
 

		bool exists = false;
		if ( f->GetFilePointer().IsIn("::") ) {
			CyString modFile = f->GetFilePointer().GetToken("::", 1, 1);
			CyString file = f->GetFilePointer().GetToken("::", 2, 2);
 
			if ( CFileIO(modFile).ExistsOld() ) {
				CCatFile catFile;
				if ( catFile.Open(modFile, "", CATREAD_CATDECRYPT, false) == CATERR_NONE ) {
					if ( catFile.FindData(file) )
						exists = true;
				}
			}
		}
		else {
			exists = CFileIO(f->GetFilePointer()).ExistsOld();
		}
 
		if ( !exists )
		{
			++count;

Rev 51	Rev 52
Line 142...	Line 142...
142	`{`	142	`{`
143	`bool oldPlugin = false;`	143	`bool oldPlugin = false;`
144		144
145	`dir = dir.FindReplace("\\", "/");`	145	`dir = dir.FindReplace("\\", "/");`
146	`CFileIO datFile(dir + "/PluginManager/pluginmanager.dat");`	146	`CFileIO datFile(dir + "/PluginManager/pluginmanager.dat");`
147	`if ( datFile.Exists() )`	147	`if ( datFile.exists() )`
148	`{`	148	`{`
149	`std::vector<CyString> *readFile = datFile.ReadLines();`	149	`std::vector<CyString> *readFile = datFile.ReadLines();`
150	`if ( readFile )`	150	`if ( readFile )`
151	`{`	151	`{`
152	`for ( int i = 0; i < (int)readFile->size(); i++ )`	152	`for ( int i = 0; i < (int)readFile->size(); i++ )`
Line 187...	Line 187...
187		187
188	`m_bVanilla = true;`	188	`m_bVanilla = true;`
189		189
190	`// check the pluginmanager data file exists`	190	`// check the pluginmanager data file exists`
191	`CFileIO datFile(m_sCurrentDir + "/PluginManager/pluginmanager.dat");`	191	`CFileIO datFile(m_sCurrentDir + "/PluginManager/pluginmanager.dat");`
192	`if ( datFile.Exists() )`	192	`if ( datFile.exists() )`
193	`{`	193	`{`
194	`std::vector<CyString> *readFile = datFile.ReadLines();`	194	`std::vector<CyString> *readFile = datFile.ReadLines();`
195	`if ( readFile )`	195	`if ( readFile )`
196	`{`	196	`{`
197	`float fVersion = 0;`	197	`float fVersion = 0;`
Line 447...	Line 447...
447	`uf->SetFilename(m_sCurrentDir + "/Scripts/" + rest.GetToken(" ", 2));`	447	`uf->SetFilename(m_sCurrentDir + "/Scripts/" + rest.GetToken(" ", 2));`
448	`m_lUninstallFiles.push_back(uf);`	448	`m_lUninstallFiles.push_back(uf);`
449	`}`	449	`}`
450	`else if ( cmd == "NonRemovedFile" )`	450	`else if ( cmd == "NonRemovedFile" )`
451	`{`	451	`{`
452	`if ( !CFileIO(rest).Remove() )`	452	`if ( !CFileIO::Remove(rest.ToString()) )`
453	`m_lNonRemovedFiles.PushBack(rest);`	453	`m_lNonRemovedFiles.PushBack(rest);`
454	`}`	454	`}`
455	`else if ( cmd == "Original" )`	455	`else if ( cmd == "Original" )`
456	`{`	456	`{`
457	`C_File *uf = new C_File();`	457	`C_File *uf = new C_File();`
Line 544...	Line 544...
544		544
545	`void CPackages::RemoveCreatedFiles()`	545	`void CPackages::RemoveCreatedFiles()`
546	`{`	546	`{`
547	`for ( SStringList *node = m_lCreatedFiles.Head(); node; node = node->next )`	547	`for ( SStringList *node = m_lCreatedFiles.Head(); node; node = node->next )`
548	`{`	548	`{`
549	`if ( CFileIO(node->str).Exists() )`	549	`if ( CFileIO(node->str).ExistsOld() )`
550	`CFileIO(node->str).Remove();`	550	`CFileIO::Remove(node->str.ToString());`
551	`else if ( CFileIO(m_sCurrentDir + "/" + node->str).Exists() )`	551	`else if ( CFileIO(m_sCurrentDir + "/" + node->str).ExistsOld() )`
552	`CFileIO(m_sCurrentDir + "/" + node->str).Remove();`	552	`CFileIO::Remove((m_sCurrentDir + "/" + node->str).ToString());`
553	`}`	553	`}`
554		554
555	`m_lCreatedFiles.Clear();`	555	`m_lCreatedFiles.Clear();`
556	`}`	556	`}`
557		557
558	`void CPackages::PurgeGameObjects()`	558	`void CPackages::PurgeGameObjects()`
559	`{`	559	`{`
560	`// check for the log file`	560	`// check for the log file`
561	`CyString logDir = GetLogDirectory();`	561	`CyString logDir = GetLogDirectory();`
562	`CFileIO LogFile(logDir + "/log0" + CyString::Number(PMTEXTFILE).PadNumber(4) + ".txt");`	562	`CFileIO LogFile(logDir + "/log0" + CyString::Number(PMTEXTFILE).PadNumber(4) + ".txt");`
563	`if ( LogFile.Exists() )`	563	`if ( LogFile.exists() )`
564	`{`	564	`{`
565	`// read the log file to memory`	565	`// read the log file to memory`
566	`std::vector<CyString> *lines = LogFile.ReadLines();`	566	`std::vector<CyString> *lines = LogFile.ReadLines();`
567	`if ( lines )`	567	`if ( lines )`
568	`{`	568	`{`
Line 584...	Line 584...
584	`}`	584	`}`
585		585
586	`delete lines;`	586	`delete lines;`
587	`}`	587	`}`
588	`// remove the log file`	588	`// remove the log file`
589	`LogFile.Remove();`	589	`LogFile.remove();`
590	`}`	590	`}`
591	`}`	591	`}`
592		592
593	`void CPackages::PurgeWares()`	593	`void CPackages::PurgeWares()`
594	`{`	594	`{`
Line 660...	Line 660...
660	`}`	660	`}`
661		661
662	`bool CPackages::ReadyFakePatch()`	662	`bool CPackages::ReadyFakePatch()`
663	`{`	663	`{`
664	`// already exists, lets skip it`	664	`// already exists, lets skip it`
665	`if ( CFileIO(m_sCurrentDir + "/PluginManager/PlugMan_Fake.cat").Exists() && CFileIO(m_sCurrentDir + "/PluginManager/PlugMan_Fake.dat").Exists() )`	665	`if ( CFileIO(m_sCurrentDir + "/PluginManager/PlugMan_Fake.cat").ExistsOld() && CFileIO(m_sCurrentDir + "/PluginManager/PlugMan_Fake.dat").ExistsOld() )`
666	`return true;`	666	`return true;`
667		667
668	`// if only one of them exists, lets remove them`	668	`// if only one of them exists, lets remove them`
669	`if ( CFileIO(m_sCurrentDir + "/PluginManager/PlugMan_Fake.cat").Exists() )`	669	`if ( CFileIO(m_sCurrentDir + "/PluginManager/PlugMan_Fake.cat").ExistsOld() )`
670	`CFileIO(m_sCurrentDir + "/PluginManager/PlugMan_Fake.cat").Remove();`	670	`CFileIO::Remove(m_sCurrentDir.ToString() + "/PluginManager/PlugMan_Fake.cat");`
671	`if ( CFileIO(m_sCurrentDir + "/PluginManager/PlugMan_Fake.dat").Exists() )`	671	`if ( CFileIO(m_sCurrentDir + "/PluginManager/PlugMan_Fake.dat").ExistsOld() )`
672	`CFileIO(m_sCurrentDir + "/PluginManager/PlugMan_Fake.dat").Remove();`	672	`CFileIO::Remove(m_sCurrentDir.ToString() + "/PluginManager/PlugMan_Fake.dat");`
673		673
674	`// now lets find the fake patch`	674	`// now lets find the fake patch`
675	`CyString useFile;`	675	`CyString useFile;`
676	`if ( m_iFakePatch > 0 )`	676	`if ( m_iFakePatch > 0 )`
677	`{`	677	`{`
Line 748...	Line 748...
748		748
749	`// no files, jsut delete them`	749	`// no files, jsut delete them`
750	`CFileIO catFile(m_sCurrentDir + "/" + useFile + ".cat");`	750	`CFileIO catFile(m_sCurrentDir + "/" + useFile + ".cat");`
751	`if ( !files \|\| !found )`	751	`if ( !files \|\| !found )`
752	`{`	752	`{`
753	`if ( catFile.Remove() )`	753	`if ( catFile.remove() )`
754	`{`	754	`{`
755	`CFileIO datFile(m_sCurrentDir + "/" + useFile + ".dat");`	755	`CFileIO datFile(m_sCurrentDir + "/" + useFile + ".dat");`
756	`if ( datFile.Remove() )`	756	`if ( datFile.remove() )`
757	`return true;`	757	`return true;`
758	`}`	758	`}`
759	`}`	759	`}`
760	`else`	760	`else`
761	`{`	761	`{`
Line 783...	Line 783...
783	`bool CPackages::CheckIfPluginManagerFile(CyString filename)`	783	`bool CPackages::CheckIfPluginManagerFile(CyString filename)`
784	`{`	784	`{`
785	`bool found = false;`	785	`bool found = false;`
786		786
787	`CFileIO catFile(m_sCurrentDir + "/" + filename + ".cat");`	787	`CFileIO catFile(m_sCurrentDir + "/" + filename + ".cat");`
788	`if ( catFile.Exists() && CFileIO(m_sCurrentDir + "/" + filename + ".dat").Exists() )`	788	`if ( catFile.exists() && CFileIO(m_sCurrentDir + "/" + filename + ".dat").ExistsOld() )`
789	`{`	789	`{`
790	`CCatFile openFile;`	790	`CCatFile openFile;`
791	`if ( openFile.Open(catFile.GetFullFilename(), this->GetAddonDir(), CATREAD_CATDECRYPT, false) == CATERR_NONE )`	791	`if ( openFile.Open(catFile.GetFullFilename(), this->GetAddonDir(), CATREAD_CATDECRYPT, false) == CATERR_NONE )`
792	`{`	792	`{`
793	`int count = 0;`	793	`int count = 0;`
Line 819...	Line 819...
819	`{`	819	`{`
820	`bool found = false;`	820	`bool found = false;`
821		821
822	`// both the cat file and dat file exists, lets open it`	822	`// both the cat file and dat file exists, lets open it`
823	`CFileIO catFile(m_sCurrentDir + "/" + filename + ".cat");`	823	`CFileIO catFile(m_sCurrentDir + "/" + filename + ".cat");`
824	`if ( catFile.Exists() && CFileIO(m_sCurrentDir + "/" + filename + ".dat").Exists() )`	824	`if ( catFile.exists() && CFileIO(m_sCurrentDir + "/" + filename + ".dat").ExistsOld() )`
825	`{`	825	`{`
826	`CCatFile openFile;`	826	`CCatFile openFile;`
827	`if ( openFile.Open(catFile.GetFullFilename(), this->GetAddonDir(), CATREAD_CATDECRYPT, false) == CATERR_NONE )`	827	`if ( openFile.Open(catFile.GetFullFilename(), this->GetAddonDir(), CATREAD_CATDECRYPT, false) == CATERR_NONE )`
828	`{`	828	`{`
829	`if ( openFile.FindData("PlugMan\\TFake.pck") )`	829	`if ( openFile.FindData("PlugMan\\TFake.pck") )`
Line 1074...	Line 1074...
1074	`}`	1074	`}`
1075		1075
1076	`int CPackages::CheckOpenPackage(CyString file, int *error)`	1076	`int CPackages::CheckOpenPackage(CyString file, int *error)`
1077	`{`	1077	`{`
1078	`// first check if it exists`	1078	`// first check if it exists`
1079	`if ( !CFileIO(file).Exists() )`	1079	`if ( !CFileIO(file).ExistsOld() )`
1080	`{`	1080	`{`
1081	`*error = INSTALLERR_NOEXIST;`	1081	`*error = INSTALLERR_NOEXIST;`
1082	`return -1;`	1082	`return -1;`
1083	`}`	1083	`}`
1084		1084
Line 1352...	Line 1352...
1352	`CLog::logf(CLog::Log_Install, 4, "File: %s", f->Data()->GetFilePointer().c_str());`	1352	`CLog::logf(CLog::Log_Install, 4, "File: %s", f->Data()->GetFilePointer().c_str());`
1353	`if ( f->Data()->GetFileType() != FILETYPE_SHIPSCENE && f->Data()->GetFileType() != FILETYPE_COCKPITSCENE && f->Data()->GetFileType() != FILETYPE_SHIPMODEL && f->Data()->GetFileType() != FILETYPE_SHIPOTHER ) {`	1353	`if ( f->Data()->GetFileType() != FILETYPE_SHIPSCENE && f->Data()->GetFileType() != FILETYPE_COCKPITSCENE && f->Data()->GetFileType() != FILETYPE_SHIPMODEL && f->Data()->GetFileType() != FILETYPE_SHIPOTHER ) {`
1354	`CLog::logf(CLog::Log_Install, 4, "Not a valid file type to add to fake patch (%d)", f->Data()->GetFileType());`	1354	`CLog::logf(CLog::Log_Install, 4, "Not a valid file type to add to fake patch (%d)", f->Data()->GetFileType());`
1355	`continue;`	1355	`continue;`
1356	`}`	1356	`}`
-		1357	`CLog::logf(CLog::Log_Install, 4, "checking addon dir");`
1357	`if ( CCatFile::IsAddonDir(f->Data()->GetNameDirectory(pPackage)) ) {`	1358	`if ( CCatFile::IsAddonDir(f->Data()->GetNameDirectory(pPackage)) ) {`
1358	`CLog::logf(CLog::Log_Install, 4, "Is an addon directory, skipping, %s", f->Data()->GetNameDirectory(pPackage).c_str());`	1359	`CLog::logf(CLog::Log_Install, 4, "Is an addon directory, skipping, %s", f->Data()->GetNameDirectory(pPackage).c_str());`
1359	`continue;`	1360	`continue;`
1360	`}`	1361	`}`
1361	`// check if its already in the fake patch`	1362	`// check if its already in the fake patch`
-		1363	`CLog::logf(CLog::Log_Install, 4, "checking full dir");`
1362	`if ( f->Data()->GetFullDir().IsIn("::") ) {`	1364	`if ( f->Data()->GetFullDir().IsIn("::") ) {`
1363	`CLog::logf(CLog::Log_Install, 4, "Is already in a mod file, skipping, %s", f->Data()->GetNameDirectory(pPackage).c_str());`	1365	`CLog::logf(CLog::Log_Install, 4, "Is already in a mod file, skipping, %s", f->Data()->GetNameDirectory(pPackage).c_str());`
1364	`continue;`	1366	`continue;`
1365	`}`	1367	`}`
1366	`CyString toFile;`	1368	`Utils::String toFile;`
1367	`CLog::logf(CLog::Log_Install, 2, "Adding file: %s into the fake patch", f->Data()->GetNameDirectory(pPackage).c_str());`	1369	`CLog::logf(CLog::Log_Install, 2, "Adding file: %s into the fake patch", f->Data()->GetNameDirectory(pPackage).c_str());`
-		1370	`CLog::logf(CLog::Log_Install, 4, "Cat File: %s", cat.GetCatFilename().c_str());`
-		1371
-		1372	`Utils::String sFilename = f->Data()->GetFilePointer().ToString();`
-		1373	`CLog::logf(CLog::Log_Install, 4, "- Filename: %s", sFilename.c_str());`
-		1374	`Utils::String sTo = f->Data()->GetNameDirectory(pPackage).ToString();`
-		1375	`CLog::logf(CLog::Log_Install, 4, "- To: %s", sTo.c_str());`
1368	`if ( cat.AppendFile(f->Data()->GetFilePointer(), f->Data()->GetNameDirectory(pPackage), true, (m_iGameFlags & EXEFLAG_NOXOR) ? false : true, &toFile) ) {`	1376	`if ( cat.AppendFile(sFilename, sTo, true, (m_iGameFlags & EXEFLAG_NOXOR) ? false : true, &toFile) ) {`
1369	`CLog::logf(CLog::Log_Install, 3, "Removing old file, %s", f->Data()->GetFilePointer().c_str());`	1377	`CLog::logf(CLog::Log_Install, 3, "Removing old file, %s", f->Data()->GetFilePointer().c_str());`
1370	`CFileIO(f->Data()->GetFilePointer()).Remove();`	1378	`CFileIO::Remove(f->Data()->GetFilePointer().ToString());`
1371	`CLog::logf(CLog::Log_Install, 3, "Adjusting file pointer to fake patch, %s => %s", f->Data()->GetFilePointer().c_str(), (m_sCurrentDir + "/PluginManager/PlugMan_Fake.cat::" + toFile).c_str());`	1379	`CLog::logf(CLog::Log_Install, 3, "Adjusting file pointer to fake patch, %s => %s", f->Data()->GetFilePointer().c_str(), (m_sCurrentDir + "/PluginManager/PlugMan_Fake.cat::" + toFile).c_str());`
1372	`f->Data()->SetFilename(m_sCurrentDir + "/PluginManager/PlugMan_Fake.cat::" + toFile);`	1380	`f->Data()->SetFilename(m_sCurrentDir + "/PluginManager/PlugMan_Fake.cat::" + toFile);`
1373	`}`	1381	`}`
1374	`}`	1382	`}`
1375	`}`	1383	`}`
Line 1555...	Line 1563...
1555	`if ( catTo.Open(findMatching->GetFilePointer(), this->GetAddonDir(), CATREAD_CATDECRYPT, false) == CATERR_NONE )`	1563	`if ( catTo.Open(findMatching->GetFilePointer(), this->GetAddonDir(), CATREAD_CATDECRYPT, false) == CATERR_NONE )`
1556	`{`	1564	`{`
1557	`for ( int i = 0; i < catFrom.GetNumFiles(); i++ )`	1565	`for ( int i = 0; i < catFrom.GetNumFiles(); i++ )`
1558	`{`	1566	`{`
1559	`SInCatFile *c = catFrom.GetFile(i);`	1567	`SInCatFile *c = catFrom.GetFile(i);`
1560	`catTo.AppendFile(f->Data()->GetFilePointer() + "::" + c->sFile, c->sFile);`	1568	`catTo.AppendFile((f->Data()->GetFilePointer() + "::" + c->sFile).ToString(), c->sFile.ToString());`
1561	`}`	1569	`}`
1562	`}`	1570	`}`
1563	`}`	1571	`}`
1564		1572
1565	`// now remove the files`	1573	`// now remove the files`
Line 1849...	Line 1857...
1849	`{`	1857	`{`
1850	`// check if its an original file and restore`	1858	`// check if its an original file and restore`
1851	`if ( IsOriginalFile(f) )`	1859	`if ( IsOriginalFile(f) )`
1852	`{`	1860	`{`
1853	`CFileIO of(m_sCurrentDir + "/PluginManager/Original/" + f->GetNameDirectory(NULL));`	1861	`CFileIO of(m_sCurrentDir + "/PluginManager/Original/" + f->GetNameDirectory(NULL));`
1854	`if ( of.Exists() )`	1862	`if ( of.exists() )`
1855	`{`	1863	`{`
1856	`original = true;`	1864	`original = true;`
1857	`if ( of.Rename(m_sCurrentDir + "/" + f->GetNameDirectory(NULL)) )`	1865	`if ( of.Rename(m_sCurrentDir + "/" + f->GetNameDirectory(NULL)) )`
1858	`this->AddLogEntry(SPKINSTALL_ORIGINAL_RESTORE, f->GetNameDirectory(NULL), errors);`	1866	`this->AddLogEntry(SPKINSTALL_ORIGINAL_RESTORE, f->GetNameDirectory(NULL), errors);`
1859	`else`	1867	`else`
Line 1919...	Line 1927...
1919	`CyString newFilename = m_sCurrentDir + "/" + newFile->GetNameDirectory(NULL);`	1927	`CyString newFilename = m_sCurrentDir + "/" + newFile->GetNameDirectory(NULL);`
1920	`CFileIO file(uf->GetFilePointer());`	1928	`CFileIO file(uf->GetFilePointer());`
1921		1929
1922	`if ( uf->GetUsed() )`	1930	`if ( uf->GetUsed() )`
1923	`{`	1931	`{`
1924	`if ( file.Copy(newFilename) )`	1932	`if ( file.copy(newFilename.ToString()) )`
1925	`this->AddLogEntry(SPKINSTALL_UNINSTALL_COPY, newFile->GetNameDirectory(NULL), errors);`	1933	`this->AddLogEntry(SPKINSTALL_UNINSTALL_COPY, newFile->GetNameDirectory(NULL), errors);`
1926	`else`	1934	`else`
1927	`{`	1935	`{`
1928	`this->AddLogEntry(SPKINSTALL_UNINSTALL_COPY_FAIL, newFile->GetNameDirectory(NULL), errors);`	1936	`this->AddLogEntry(SPKINSTALL_UNINSTALL_COPY_FAIL, newFile->GetNameDirectory(NULL), errors);`
1929	`delete newFile;`	1937	`delete newFile;`
Line 2428...	Line 2436...
2428	`if ( m_bRenameText )`	2436	`if ( m_bRenameText )`
2429	`CreateLanguageTextFiles(errors);`	2437	`CreateLanguageTextFiles(errors);`
2430		2438
2431	`this->BackupSaves();`	2439	`this->BackupSaves();`
2432		2440
2433	`if ( CFileIO(m_sCurrentDir + "/mods/PluginManager.dat").Exists() )`	2441	`if ( CFileIO(m_sCurrentDir + "/mods/PluginManager.dat").ExistsOld() )`
2434	`CFileIO(m_sCurrentDir + "/mods/PluginManager.dat").Remove();`	2442	`CFileIO::Remove(m_sCurrentDir.ToString() + "/mods/PluginManager.dat");`
2435	`if ( CFileIO(m_sCurrentDir + "/mods/PluginManager.cat").Exists() )`	2443	`if ( CFileIO(m_sCurrentDir + "/mods/PluginManager.cat").ExistsOld() )`
2436	`CFileIO(m_sCurrentDir + "/mods/PluginManager.cat").Remove();`	2444	`CFileIO::Remove(m_sCurrentDir.ToString() + "/mods/PluginManager.cat");`
2437		2445
2438	`if ( !m_bVanilla )`	2446	`if ( !m_bVanilla )`
2439	`{`	2447	`{`
2440	`// base mode for Reunion`	2448	`// base mode for Reunion`
2441	`if ( m_iGame == GAME_X3 && m_pEnabledMod )`	2449	`if ( m_iGame == GAME_X3 && m_pEnabledMod )`
Line 2450...	Line 2458...
2450	`while ( fCat && !fCat->IsFakePatch() && !fCat->CheckFileExt("cat") && !fCat->GetBaseName().Compare(fDat->GetBaseName()) )`	2458	`while ( fCat && !fCat->IsFakePatch() && !fCat->CheckFileExt("cat") && !fCat->GetBaseName().Compare(fDat->GetBaseName()) )`
2451	`fCat = m_pEnabledMod->GetNextFile(fCat);`	2459	`fCat = m_pEnabledMod->GetNextFile(fCat);`
2452		2460
2453	`if ( fCat )`	2461	`if ( fCat )`
2454	`{`	2462	`{`
2455	`CFileIO(fDat->GetFilePointer()).Copy(m_sCurrentDir + "/mods/PluginManager.dat");`	2463	`CFileIO(fDat->GetFilePointer()).copy(m_sCurrentDir.ToString() + "/mods/PluginManager.dat");`
2456	`CFileIO(fCat->GetFilePointer()).Copy(m_sCurrentDir + "/mods/PluginManager.cat");`	2464	`CFileIO(fCat->GetFilePointer()).copy(m_sCurrentDir.ToString() + "/mods/PluginManager.cat");`
2457	`}`	2465	`}`
2458	`}`	2466	`}`
2459	`}`	2467	`}`
2460	`else if ( m_iGame == GAME_X3 && !m_sSetMod.Empty() && CFileIO(m_sCurrentDir + "/mods/" + m_sSetMod + ".cat").Exists() && CFileIO(m_sCurrentDir + "/mods/" + m_sSetMod + ".dat").Exists() )`	2468	`else if ( m_iGame == GAME_X3 && !m_sSetMod.Empty() && CFileIO(m_sCurrentDir + "/mods/" + m_sSetMod + ".cat").ExistsOld() && CFileIO(m_sCurrentDir + "/mods/" + m_sSetMod + ".dat").ExistsOld() )`
2461	`{`	2469	`{`
2462	`CFileIO(m_sCurrentDir + "/mods/" + m_sSetMod + ".dat").Copy(m_sCurrentDir + "/mods/PluginManager.dat");`	2470	`CFileIO(m_sCurrentDir + "/mods/" + m_sSetMod + ".dat").copy(m_sCurrentDir.ToString() + "/mods/PluginManager.dat");`
2463	`CFileIO(m_sCurrentDir + "/mods/" + m_sSetMod + ".cat").Copy(m_sCurrentDir + "/mods/PluginManager.cat");`	2471	`CFileIO(m_sCurrentDir + "/mods/" + m_sSetMod + ".cat").copy(m_sCurrentDir.ToString() + "/mods/PluginManager.cat");`
2464	`}`	2472	`}`
2465		2473
2466	`if ( !CDirIO(m_sCurrentDir).Exists("mods") )`	2474	`if ( !CDirIO(m_sCurrentDir).Exists("mods") )`
2467	`CDirIO(m_sCurrentDir).Create("mods");`	2475	`CDirIO(m_sCurrentDir).Create("mods");`
2468		2476
Line 2529...	Line 2537...
2529		2537
2530	`CFileIO catFile(m_sCurrentDir + "/PluginManager/PlugMan_Fake.cat");`	2538	`CFileIO catFile(m_sCurrentDir + "/PluginManager/PlugMan_Fake.cat");`
2531	`CFileIO datFile(m_sCurrentDir + "/PluginManager/PlugMan_Fake.dat");`	2539	`CFileIO datFile(m_sCurrentDir + "/PluginManager/PlugMan_Fake.dat");`
2532		2540
2533	`// if only 1 exists, remove it`	2541	`// if only 1 exists, remove it`
2534	`if ( catFile.Exists() && !datFile.Exists() )`	2542	`if ( catFile.exists() && !datFile.exists() ) {`
2535	`{`	-
2536	`if ( !catFile.Remove() )`	2543	`if ( !catFile.remove() ) return false;`
2537	`return false;`	-
2538	`}`	2544	`}`
2539	`else if ( !catFile.Exists() && datFile.Exists() )`	2545	`else if ( !catFile.exists() && datFile.exists() ) {`
2540	`{`	-
2541	`if ( !datFile.Remove() )`	2546	`if ( !datFile.remove() ) return false;`
2542	`return false;`	-
2543	`}`	2547	`}`
2544		2548
2545	`// if both exists, lets rename them`	2549	`// if both exists, lets rename them`
2546	`if ( catFile.Exists() && datFile.Exists() )`	2550	`if ( catFile.exists() && datFile.exists() )`
2547	`{`	2551	`{`
2548	`// we need to add the plugin manager file in`	2552	`// we need to add the plugin manager file in`
2549	`CyString file = m_sTempDir;`	2553	`CyString file = m_sTempDir;`
2550	`if ( !file.Empty() )`	2554	`if ( !file.Empty() )`
2551	`file += "/";`	2555	`file += "/";`
Line 2557...	Line 2561...
2557	`fakeFile.WriteFile(&lines);`	2561	`fakeFile.WriteFile(&lines);`
2558		2562
2559	`CCatFile fakePatch;`	2563	`CCatFile fakePatch;`
2560	`if ( fakePatch.Open(m_sCurrentDir + "/PluginManager/PlugMan_Fake.cat", this->GetAddonDir(), CATREAD_DAT, false) == CATERR_NONE )`	2564	`if ( fakePatch.Open(m_sCurrentDir + "/PluginManager/PlugMan_Fake.cat", this->GetAddonDir(), CATREAD_DAT, false) == CATERR_NONE )`
2561	`{`	2565	`{`
2562	`if ( fakePatch.AppendFile(file, "PlugMan\\TFake.pck") )`	2566	`if ( fakePatch.AppendFile(file.ToString(), "PlugMan\\TFake.pck") )`
2563	`{`	2567	`{`
2564	`// find next available fake patch`	2568	`// find next available fake patch`
2565	`m_iFakePatch = this->FindNextFakePatch();`	2569	`m_iFakePatch = this->FindNextFakePatch();`
2566		2570
2567	`CyString filename = CyString::Number(m_iFakePatch).PadNumber(2);`	2571	`CyString filename = CyString::Number(m_iFakePatch).PadNumber(2);`
2568	`if ( catFile.Rename(m_sCurrentDir + "/" + filename + ".cat") )`	2572	`if ( catFile.Rename(m_sCurrentDir + "/" + filename + ".cat") )`
2569	`{`	2573	`{`
2570	`if ( datFile.Rename(m_sCurrentDir + "/" + filename + ".dat") )`	2574	`if ( datFile.Rename(m_sCurrentDir + "/" + filename + ".dat") ){`
2571	`{`	-
2572	`fakeFile.Remove();`	2575	`fakeFile.remove();`
2573	`return true;`	2576	`return true;`
2574	`}`	2577	`}`
2575		2578
2576	`// TODO: restore cat file`	2579	`// TODO: restore cat file`
2577	`}`	2580	`}`
2578	`}`	2581	`}`
2579	`}`	2582	`}`
2580		2583
2581	`fakeFile.Remove();`	2584	`fakeFile.remove();`
2582	`return false;`	2585	`return false;`
2583	`}`	2586	`}`
2584		2587
2585	`return true;`	2588	`return true;`
2586	`}`	2589	`}`
Line 2952...	Line 2955...
2952	`// check if theres an original file to backup`	2955	`// check if theres an original file to backup`
2953	`C_File *of = GetOriginalFile(f);`	2956	`C_File *of = GetOriginalFile(f);`
2954	`if ( of )`	2957	`if ( of )`
2955	`{`	2958	`{`
2956	`// check if the orignal file is already backed up`	2959	`// check if the orignal file is already backed up`
2957	`if ( !CFileIO(m_sCurrentDir + "/PluginManager/Original/" + f->GetNameDirectory(package)).Exists() )`	2960	`if ( !CFileIO(m_sCurrentDir + "/PluginManager/Original/" + f->GetNameDirectory(package)).ExistsOld() )`
2958	`{`	2961	`{`
2959	`// lets back up the file now`	2962	`// lets back up the file now`
2960	`BackupOriginalFile(of, errors);`	2963	`BackupOriginalFile(of, errors);`
2961	`}`	2964	`}`
2962	`}`	2965	`}`
Line 2985...	Line 2988...
2985		2988
2986	`// lets actually move the file back now`	2989	`// lets actually move the file back now`
2987	`// !!error checking!!`	2990	`// !!error checking!!`
2988	`CFileIO currentFile(f->GetFilePointer());`	2991	`CFileIO currentFile(f->GetFilePointer());`
2989	`CFileIO newFile(m_sCurrentDir + "/" + newFilename);`	2992	`CFileIO newFile(m_sCurrentDir + "/" + newFilename);`
2990	`if ( !currentFile.Exists() )`	2993	`if ( !currentFile.exists() )`
2991	`{`	2994	`{`
2992	`// missing file ??`	2995	`// missing file ??`
2993	`if ( !newFile.Exists() )`	2996	`if ( !newFile.exists() )`
2994	`{`	2997	`{`
2995	`this->AddLogEntry(SPKINSTALL_MISSINGFILE, newFilename, errors);`	2998	`this->AddLogEntry(SPKINSTALL_MISSINGFILE, newFilename, errors);`
2996	`continue;`	2999	`continue;`
2997	`}`	3000	`}`
2998	`}`	3001	`}`
2999	`// remove existing file`	3002	`// remove existing file`
3000	`// file exists, so lets try to move it`	3003	`// file exists, so lets try to move it`
3001	`else`	3004	`else`
3002	`{`	3005	`{`
3003	`if ( newFile.Exists() )`	3006	`if ( newFile.exists() )`
3004	`newFile.Remove();`	3007	`newFile.remove();`
3005		3008
3006	`if ( !currentFile.Rename(newFile.GetFullFilename()) )`	3009	`if ( !currentFile.Rename(newFile.GetFullFilename()) )`
3007	`{`	3010	`{`
3008	`this->AddLogEntry(SPKINSTALL_ENABLEFILE_FAIL, newFilename, errors);`	3011	`this->AddLogEntry(SPKINSTALL_ENABLEFILE_FAIL, newFilename, errors);`
3009	`continue;`	3012	`continue;`
Line 3180...	Line 3183...
3180		3183
3181	`// now to move the file by renameing it to its new location`	3184	`// now to move the file by renameing it to its new location`
3182	`// !!error checking!!`	3185	`// !!error checking!!`
3183	`// check the file, if it doesn't exist, and exists as disabled, we should just adjust the setting instead of an error`	3186	`// check the file, if it doesn't exist, and exists as disabled, we should just adjust the setting instead of an error`
3184	`CFileIO currentFile(f->GetFilePointer());`	3187	`CFileIO currentFile(f->GetFilePointer());`
3185	`if ( !currentFile.Exists() )`	3188	`if ( !currentFile.exists() )`
3186	`{`	3189	`{`
3187	`if ( !CFileIO(newFilename).Exists() )`	3190	`if ( !CFileIO(newFilename).exists() )`
3188	`{`	3191	`{`
3189	`this->AddLogEntry(SPKINSTALL_MISSINGFILE, f->GetNameDirectory(checkPackage), errors);`	3192	`this->AddLogEntry(SPKINSTALL_MISSINGFILE, f->GetNameDirectory(checkPackage), errors);`
3190	`continue;`	3193	`continue;`
3191	`}`	3194	`}`
3192	`}`	3195	`}`
Line 3202...	Line 3205...
3202		3205
3203	`// check if its an original file and restore`	3206	`// check if its an original file and restore`
3204	`if ( IsOriginalFile(f) )`	3207	`if ( IsOriginalFile(f) )`
3205	`{`	3208	`{`
3206	`CFileIO of(m_sCurrentDir + "/PluginManager/Original/" + f->GetNameDirectory(checkPackage));`	3209	`CFileIO of(m_sCurrentDir + "/PluginManager/Original/" + f->GetNameDirectory(checkPackage));`
3207	`if ( of.Exists() )`	3210	`if ( of.exists() )`
3208	`{`	3211	`{`
3209	`original = true;`	3212	`original = true;`
3210	`if ( of.Rename(m_sCurrentDir + "/" + f->GetNameDirectory(checkPackage)) )`	3213	`if ( of.Rename(m_sCurrentDir + "/" + f->GetNameDirectory(checkPackage)) )`
3211	`this->AddLogEntry(SPKINSTALL_ORIGINAL_RESTORE, f->GetNameDirectory(checkPackage), errors);`	3214	`this->AddLogEntry(SPKINSTALL_ORIGINAL_RESTORE, f->GetNameDirectory(checkPackage), errors);`
3212	`else`	3215	`else`
Line 3776...	Line 3779...
3776	`* Removes a single uninstall file`	3779	`* Removes a single uninstall file`
3777	`*/`	3780	`*/`
3778	`bool CPackages::RemoveUninstallFile(C_File file, CyStringList errors)`	3781	`bool CPackages::RemoveUninstallFile(C_File file, CyStringList errors)`
3779	`{`	3782	`{`
3780	`CFileIO fio(file->GetFilePointer());`	3783	`CFileIO fio(file->GetFilePointer());`
3781	`if ( fio.Exists() )`	3784	`if ( fio.exists() )`
3782	`{`	3785	`{`
3783	`if ( fio.Remove() )`	3786	`if ( fio.remove() ) {`
3784	`{`	-
3785	`this->AddLogEntry(SPKINSTALL_UNINSTALL_REMOVE, file->GetNameDirectory(NULL), errors);`	3787	`this->AddLogEntry(SPKINSTALL_UNINSTALL_REMOVE, file->GetNameDirectory(NULL), errors);`
3786	`return true;`	3788	`return true;`
3787	`}`	3789	`}`
3788	`else if ( errors )`	3790	`else if ( errors )`
3789	`this->AddLogEntry(SPKINSTALL_UNINSTALL_REMOVE_FAIL, file->GetNameDirectory(NULL), errors);`	3791	`this->AddLogEntry(SPKINSTALL_UNINSTALL_REMOVE_FAIL, file->GetNameDirectory(NULL), errors);`
Line 3849...	Line 3851...
3849	`* Removes a single file`	3851	`* Removes a single file`
3850	`*/`	3852	`*/`
3851	`bool CPackages::RemoveSharedFile(C_File file, CyStringList errors)`	3853	`bool CPackages::RemoveSharedFile(C_File file, CyStringList errors)`
3852	`{`	3854	`{`
3853	`CFileIO fio(file->GetFilePointer());`	3855	`CFileIO fio(file->GetFilePointer());`
3854	`if ( fio.Exists() )`	3856	`if ( fio.exists() )`
3855	`{`	3857	`{`
3856	`if ( fio.Remove() )`	3858	`if ( fio.remove() ) {`
3857	`{`	-
3858	`this->AddLogEntry(SPKINSTALL_SHARED, file->GetNameDirectory(NULL), errors);`	3859	`this->AddLogEntry(SPKINSTALL_SHARED, file->GetNameDirectory(NULL), errors);`
3859	`delete file;`	3860	`delete file;`
3860	`return true;`	3861	`return true;`
3861	`}`	3862	`}`
3862	`else if ( errors )`	3863	`else if ( errors )`
Line 4078...	Line 4079...
4078	`this->AddLogEntry(SPKINSTALL_CREATEDIRECTORY, newDir, errors);`	4079	`this->AddLogEntry(SPKINSTALL_CREATEDIRECTORY, newDir, errors);`
4079	`}`	4080	`}`
4080		4081
4081	`// now lets copy the file`	4082	`// now lets copy the file`
4082	`CFileIO CopyFile(f->GetFilePointer());`	4083	`CFileIO CopyFile(f->GetFilePointer());`
4083	`if ( CopyFile.Copy(oDir.File(newDir + "/" + f->GetFilename())) )`	4084	`if ( CopyFile.copy(oDir.File(newDir + "/" + f->GetFilename()).ToString()) )`
4084	`{`	4085	`{`
4085	`CLog::logf(CLog::Log_Install, 2, "Original file: %s has been backed up", f->GetNameDirectory(NULL).c_str());`	4086	`CLog::logf(CLog::Log_Install, 2, "Original file: %s has been backed up", f->GetNameDirectory(NULL).c_str());`
4086	`this->AddLogEntry(SPKINSTALL_ORIGINAL_BACKUP, f->GetNameDirectory(NULL), errors);`	4087	`this->AddLogEntry(SPKINSTALL_ORIGINAL_BACKUP, f->GetNameDirectory(NULL), errors);`
4087	`return true;`	4088	`return true;`
4088	`}`	4089	`}`
Line 4281...	Line 4282...
4281	`// check its filename, it might already be in the correct place`	4282	`// check its filename, it might already be in the correct place`
4282	`if ( lowestFile->GetBaseName().ToInt() != lowest )`	4283	`if ( lowestFile->GetBaseName().ToInt() != lowest )`
4283	`{`	4284	`{`
4284	`// if the file already exists, we need to move it elsewhere`	4285	`// if the file already exists, we need to move it elsewhere`
4285	`CyString nextName = CyString::Number(lowest).PadNumber(2);`	4286	`CyString nextName = CyString::Number(lowest).PadNumber(2);`
4286	`if ( CFileIO(m_sCurrentDir + "/" + nextName + ".cat").Exists() )`	4287	`if ( CFileIO(m_sCurrentDir + "/" + nextName + ".cat").ExistsOld() )`
4287	`{`	4288	`{`
4288	`// find the file in our internal file list`	4289	`// find the file in our internal file list`
4289	`C_File *moveFile = FindFile(FILETYPE_MOD, nextName + ".cat");`	4290	`C_File *moveFile = FindFile(FILETYPE_MOD, nextName + ".cat");`
4290	`if ( !moveFile ) // must not have it in our list ? lets move to the next`	4291	`if ( !moveFile ) // must not have it in our list ? lets move to the next`
4291	`{`	4292	`{`
Line 4772...	Line 4773...
4772	`CyString remFileStr = file->GetFilePointer();`	4773	`CyString remFileStr = file->GetFilePointer();`
4773	`remFileStr.FindReplace(m_sCurrentDir, "");`	4774	`remFileStr.FindReplace(m_sCurrentDir, "");`
4774		4775
4775	`if ( file->GetFilePointer().IsIn("::") ) {`	4776	`if ( file->GetFilePointer().IsIn("::") ) {`
4776	`CFileIO CatFile(file->GetFilePointer().GetToken("::", 1, 1));`	4777	`CFileIO CatFile(file->GetFilePointer().GetToken("::", 1, 1));`
4777	`if ( CatFile.Exists() ) {`	4778	`if ( CatFile.exists() ) {`
4778	`CCatFile cat;`	4779	`CCatFile cat;`
4779	`if ( cat.Open(CatFile.GetFullFilename(), this->GetAddonDir(), CATREAD_DAT, false) == CATERR_NONE ) {`	4780	`if ( cat.Open(CatFile.GetFullFilename(), this->GetAddonDir(), CATREAD_DAT, false) == CATERR_NONE ) {`
4780	`CyString fileName = file->GetFilePointer().GetToken("::", 2, 2);`	4781	`CyString fileName = file->GetFilePointer().GetToken("::", 2, 2);`
4781	`if ( cat.FindData(fileName) ) {`	4782	`if ( cat.FindData(fileName) ) {`
4782	`if ( cat.RemoveFile(fileName) ) {`	4783	`if ( cat.RemoveFile(fileName) ) {`
Line 4790...	Line 4791...
4790	`}`	4791	`}`
4791	`}`	4792	`}`
4792	`}`	4793	`}`
4793	`else {`	4794	`else {`
4794	`CFileIO f(file->GetFilePointer());`	4795	`CFileIO f(file->GetFilePointer());`
4795	`if ( f.Exists() )`	4796	`if ( f.exists() )`
4796	`{`	4797	`{`
4797	`if ( f.Remove() )`	-
4798	`this->AddLogEntry(SPKINSTALL_DELETEFILE, remFileStr, errors);`	4798	`if ( f.remove() ) this->AddLogEntry(SPKINSTALL_DELETEFILE, remFileStr, errors);`
4799	`else if ( errors )`	4799	`else if ( errors )`
4800	`{`	4800	`{`
4801	`this->AddLogEntry(SPKINSTALL_DELETEFILE_FAIL, remFileStr, errors);`	4801	`this->AddLogEntry(SPKINSTALL_DELETEFILE_FAIL, remFileStr, errors);`
4802	`return false;`	4802	`return false;`
4803	`}`	4803	`}`
Line 4835...	Line 4835...
4835	`progress->UpdateProgress(files, max);`	4835	`progress->UpdateProgress(files, max);`
4836	`++files;`	4836	`++files;`
4837		4837
4838	`C_File *f = oNode->Data();`	4838	`C_File *f = oNode->Data();`
4839	`CFileIO of(m_sCurrentDir + "/PluginManager/Original/" + f->GetNameDirectory(NULL));`	4839	`CFileIO of(m_sCurrentDir + "/PluginManager/Original/" + f->GetNameDirectory(NULL));`
4840	`if ( of.Exists() )`	4840	`if ( of.exists() )`
4841	`of.Rename(m_sCurrentDir + "/" + f->GetNameDirectory(NULL));`	4841	`of.Rename(m_sCurrentDir + "/" + f->GetNameDirectory(NULL));`
4842		4842
4843	`//RemoveFile(oNode->Data());`	4843	`//RemoveFile(oNode->Data());`
4844	`delete oNode->Data();`	4844	`delete oNode->Data();`
4845	`}`	4845	`}`
Line 4944...	Line 4944...
4944	`m_gameExe.Reset();`	4944	`m_gameExe.Reset();`
4945		4945
4946	`CyString exeFile = this->FindDataDir(dir, "exe");`	4946	`CyString exeFile = this->FindDataDir(dir, "exe");`
4947		4947
4948	`// if file exists, read it, otherwise, just add`	4948	`// if file exists, read it, otherwise, just add`
4949	`if ( !exeFile.Empty() && CFileIO(exeFile).Exists() )`	4949	`if ( !exeFile.Empty() && CFileIO(exeFile).ExistsOld() )`
4950	`m_gameExe.ReadFile(exeFile);`	4950	`m_gameExe.ReadFile(exeFile);`
4951	`else`	4951	`else`
4952	`{`	4952	`{`
4953	`m_gameExe.ParseExe("x2.exe:5:NOSAVESUBDIR:HKCU/Software/EgoSoftware/X2/ModName:X2 The Threat:!GAMEDIR!:2:1604608!2150400:1.4 Artifical Life:1974272:1.5 Uplink");`	4953	`m_gameExe.ParseExe("x2.exe:5:NOSAVESUBDIR:HKCU/Software/EgoSoftware/X2/ModName:X2 The Threat:!GAMEDIR!:2:1604608!2150400:1.4 Artifical Life:1974272:1.5 Uplink");`
4954	`m_gameExe.ParseExe("x3.exe:5:0:HKCU/Software/Egosoft/X3/ModName:X3 Reunion:Egosoft/X3:2:2347008:2.0 Bala Gi:2367488!2375680:2.5 Uplink");`	4954	`m_gameExe.ParseExe("x3.exe:5:0:HKCU/Software/Egosoft/X3/ModName:X3 Reunion:Egosoft/X3:2:2347008:2.0 Bala Gi:2367488!2375680:2.5 Uplink");`
Line 5107...	Line 5107...
5107	`}`	5107	`}`
5108	`}`	5108	`}`
5109	`}`	5109	`}`
5110	`else if ( !m_sSetMod.Empty() )`	5110	`else if ( !m_sSetMod.Empty() )`
5111	`{`	5111	`{`
5112	`if ( CFileIO(m_sCurrentDir + "/mods/" + m_sSetMod + ".cat").Exists() )`	5112	`if ( CFileIO(m_sCurrentDir + "/mods/" + m_sSetMod + ".cat").ExistsOld() )`
5113	`{`	5113	`{`
5114	`CCatFile catFile;`	5114	`CCatFile catFile;`
5115	`if ( catFile.Open(m_sCurrentDir + "/mods/" + m_sSetMod + ".cat", addonDir, CATREAD_CATDECRYPT, false) == CATERR_NONE )`	5115	`if ( catFile.Open(m_sCurrentDir + "/mods/" + m_sSetMod + ".cat", addonDir, CATREAD_CATDECRYPT, false) == CATERR_NONE )`
5116	`{`	5116	`{`
5117	`if ( catFile.ExtractFile(aFilename, aTo) )`	5117	`if ( catFile.ExtractFile(aFilename, aTo) )`
Line 5125...	Line 5125...
5125	`}`	5125	`}`
5126	`}`	5126	`}`
5127		5127
5128	`// find the highest cat number`	5128	`// find the highest cat number`
5129	`int catNumber = 1;`	5129	`int catNumber = 1;`
5130	`while ( CFileIO(dir + "/" + CyString::Number(catNumber).PadNumber(2) + ".cat").Exists() && catNumber < 99 )`	5130	`while ( CFileIO(dir + "/" + CyString::Number(catNumber).PadNumber(2) + ".cat").ExistsOld() && catNumber < 99 )`
5131	`++catNumber;`	5131	`++catNumber;`
5132		5132
5133	`// get the last one, not the next free one`	5133	`// get the last one, not the next free one`
5134	`--catNumber;`	5134	`--catNumber;`
5135		5135
Line 5169...	Line 5169...
5169	`wareFile += (char)UPPER(wareType);`	5169	`wareFile += (char)UPPER(wareType);`
5170		5170
5171	`CyString openFile;`	5171	`CyString openFile;`

Subversion Repositories spk

(root)//libspk/src/Packages.cpp – Rev 51 → 52