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



	m_gameExe.getDirectoryData(_pCurrentDir);
	_pCurrentDir->langid = this->getGameLanguage(_pCurrentDir->dir.toString());
	if (_pCurrentDir->langid > 0)
		_pCurrentDir->langname = this->ConvertLanguage(_pCurrentDir->langid).toWString();
 
	updateFoundPackages(L"");
}
 
 
void CPackages::SetVanilla(bool b)
{

	m_bRemoveDir = false;
	m_bDisableVanilla = false;
	m_bSurpressProtectedWarning = false;
	m_iSaveGame = -1;
	m_iSaveGameManager = -1;
	m_sSetMod = L"";
 
	for ( int i = 0; i < WAREBUFFERS; i++ )
	{
		m_iWareBuffer[i] = 0;
		m_lGameWares[i].MemoryClear();

	{
		C_File *f;
		for ( f = m_pEnabledMod->GetFirstFile(FILETYPE_MOD); f; f = m_pEnabledMod->GetNextFile(f) )
		{
			if (f->IsFakePatch()) continue;
			if (f->checkFileExt(L"cat")) break;
		}
 
		if ( f )
			m_pGameVFS.LoadFilesystem(m_sCurrentDir, f->filePointer(), 0);
		else

}
 
bool CPackages::read(const Utils::WString& dir, CProgressInfo* progress)
{
	m_sCurrentDir = dir;
	m_sCurrentDir = m_sCurrentDir.findReplace(L"\\", L"/");
	this->setCurrentDir(dir);
	m_bOldPlugin = false;
	_lCreatedFiles.clear();
	m_bRemoveDir = false;
	m_bSurpressProtectedWarning = false;

			{
				Utils::WString useAddonDir = addonDir;
				if ( !useAddonDir.empty() ) useAddonDir += L"\\";
				for (auto itr = files->cbegin(); itr != files->cend(); itr++)
				{
					if ((*itr)->sFile.Compare(L"PlugMan\\TFake.pck") )
						continue;
					if ((*itr)->sFile.Compare(useAddonDir + L"t\\44" + Utils::WString::PadNumber(PMTEXTFILE, 4) + L".pck"))
						continue;
					if ((*itr)->sFile.Compare(useAddonDir + L"t\\" + Utils::WString::PadNumber(PMTEXTFILE, 4) + L"-L044.pck"))
						continue;
 
					found = true;
					break;
				}

						return true;
				}
			}
			else
			{
				if ( catFile.Rename(m_sCurrentDir + L"/PluginManager/PlugMan_Fake.cat") )
				{
					CFileIO datFile(m_sCurrentDir + L"/" + useFile + L".dat");
 
					if ( datFile.Rename(m_sCurrentDir + L"/PluginManager/PlugMan_Fake.dat") )
						return true;
 
					// TODO: it failed, restore cat file and do error
				}
			}

		// if we're here, we tryed, and failed
		return false;
	}
	// no files found, but we have a fake patch ? restore from backup
	else if ( m_iFakePatch > 0 ) {
		CLog::log(CLog::Log_Directory, 1, L"PlugMan FakePatch seems to be missing (" + Utils::WString::Number(m_iFakePatch) + L"), Restoring from backup");
		CFileIO catFile(m_sCurrentDir + L"/PluginManager/Backup/PlugMan_Fake.cat");
		if ( catFile.exists() ) {
			catFile.copy(m_sCurrentDir + L"/PluginManager/PlugMan_Fake.cat");
			CFileIO datFile(m_sCurrentDir + L"/PluginManager/Backup/PlugMan_Fake.dat");
			if ( datFile.exists() ) datFile.copy(m_sCurrentDir + L"/PluginManager/PlugMan_Fake.dat");
		}
	}
 
	// otherwise we didn't need to (hopefully)
	return true;

	if ( catFile.exists() && CFileIO::Exists(m_sCurrentDir + L"/" + filename + L".dat"))
	{
		CCatFile openFile;
		if ( openFile.open(catFile.fullFilename(), this->getAddonDir(), CATREAD_CATDECRYPT, false) == CATERR_NONE)
		{
			if ( openFile.findData(L"PlugMan\\TFake.pck") )
				return true;
			if ( openFile.findData(L"pluginmanagerfake.pck") )
				return true;
		}
	}
 
	return false;

				gNode->Data()->iVersion = version;
			}
		}
	}
 
	if ( package->forumLink().empty() && package->webSite().contains(L"forum.egosoft")) {
		package->setForumLink(package->webSite());
		package->setWebSite(L"");
	}
 
	// convert the version
	if ( package->GetType() == TYPE_SPK )
	{

	// any extra files that are in director folder
	if ( package->AnyFileType(FILETYPE_EXTRA) )
	{
		for ( C_File *f = package->GetFirstFile(FILETYPE_EXTRA); f; f = package->GetNextFile(f) )
		{
			if ( !f->dir().Compare(L"director") )
				continue;
			if (f->checkFileExt(L"xml") || f->checkFileExt(L"pck"))
			{
				f->setDir(L"");
				f->setFileType(FILETYPE_MISSION);
			}
		}
	}
}

			}
			if ( CCatFile::IsAddonDir(f->Data()->getNameDirectory(pPackage)) ) {
				continue;
			}
			// check if its already in the fake patch
			if ( f->Data()->fullDir().contains(L"::") ) {
				continue;
			}
			Utils::WString toFile;
			if ( cat.appendFile(f->Data()->filePointer(), f->Data()->getNameDirectory(pPackage), true, (m_iGameFlags & EXEFLAG_NOXOR) ? false : true, &toFile) ) {
				CLog::logf(CLog::Log_Install, 2, "Adding file: %s into the fake patch", f->Data()->getNameDirectory(pPackage).c_str());

	bool prevDisabled = disabled;
 
	// first check if we are installed a mod
	if ( package->IsMod() && m_pEnabledMod && !m_bForceModInstall ) {
		disabled = true;
		CLog::log(CLog::Log_Install, 2, L"Package is a mod and another mod is already enabled, setting to disabled");
	}
	// if vanilla nad package aint signed
	if ( m_bVanilla && !package->IsSigned() ) {
		disabled = true;
		CLog::log(CLog::Log_Install, 2, L"Package is a not signed and are we in vanilla mode, setting to disabled");
	}
 
	// check any depancies
	if ( !disabled && !this->CheckEnabledDependacy(package) ) {
		disabled = true;
		CLog::log(CLog::Log_Install, 2, L"Dependacies missing for package, setting to disabled");
	}
 
	// search for an old version
	if ( oldPackage && oldPackage == m_pEnabledMod && disabled )
		disabled = prevDisabled;

	// update packages must have an old package installed already (should have been checked for already)
	if ( package->GetType() == TYPE_SPK )
	{
		if ( ((CSpkFile *)package)->IsPackageUpdate() )
		{
			CLog::log(CLog::Log_Install, 3, L"Package is an Update, checking for existing package installed");
			if ( !oldPackage ) {
				CLog::log(CLog::Log_Install, 2, L"Package is an Update but no existing package found, cancelling install");
				return false;
			}
			// change any mods to temp ones
			for ( CListNode<C_File> *f = package->GetFileList()->Front(); f; f = f->next() )
			{
				if ( f->Data()->GetFileType() != FILETYPE_MOD )
					continue;
 
				f->Data()->setDir(L"temp");
				if ( f->Data()->IsFakePatch() ) {
					CLog::logf(CLog::Log_Install, 2, "Moving fake package to temporary location to preper for update, %s", f->Data()->filePointer().c_str());
					f->Data()->setName(L"Fake_" + f->Data()->name());
				}
			}
		}
	}
 
	// no need to backup if we're disabling them
	if ( !disabled )
	{
		// find any uninstall files and remove them
		CLog::log(CLog::Log_Install, 3, L"Purging uninstall scripts");
		this->purgeUninstallScripts(package, errors);
 
		// backup any original files before installing
		_pOriginalFiles->backup(package, errors);
	}
 
	// install all the files
	CLog::log(CLog::Log_Install, 3, L"Checking for any existing files");
	if ( oldPackage )
	{
		CLog::logf(CLog::Log_Install, 3, "Excluding existing package (%s) from file check list", oldPackage->version().c_str());
		CLinkList<CBaseFile> excludeList;
		excludeList.push_back(oldPackage);
		this->UpdateUsedFiles(&excludeList, true);
	}
	else
		this->UpdateUsedFiles(0, true);
 
	CLog::log(CLog::Log_Install, 3, L"Reading all files into memory");
	package->ReadAllFilesToMemory();
 
	CLog::log(CLog::Log_Install, 3, L"Starting to install files");
	if ( !package->installFiles (m_sCurrentDir.toString(), progress, &m_lFiles, errors, !disabled, this))
	{
		CLog::log(CLog::Log_Install, 2, L"There was an error installing files!!");
 
		// TODO: clear up installed files
		return false;
	}
 

				if ( !f->Data() )
					continue;
				if ( f->Data()->GetFileType() != FILETYPE_MOD )
					continue;
				// we only need the cat file
				if (!f->Data()->checkFileExt(L"cat"))
					continue;
 
				// if fake patch, find first fake patch in package
				C_File *findMatching = NULL;
				if ( f->Data()->baseName().left(5).Compare(L"fake_") )
				{
					for ( CListNode<C_File> *node = oldPackage->GetFileList()->Front(); node; node = node->next() )
					{
						if ( !node->Data() )
							continue;
						if ( node->Data()->GetFileType() != FILETYPE_MOD )
							continue;
						// we only need the cat file
						if ( !node->Data()->checkFileExt(L"cat") )
							continue;
						if ( !node->Data()->IsFakePatch() )
							continue;
 
						findMatching = node->Data();

						if ( !node->Data() )
							continue;
						if ( node->Data()->GetFileType() != FILETYPE_MOD )
							continue;
						// we only need the cat file
						if (!node->Data()->checkFileExt(L"cat"))
							continue;
 
						if ( node->Data()->name().Compare(f->Data()->name()) )
						{
							findMatching = node->Data();

 
				if ( findMatching )
				{
					// copy accross all mods
					CCatFile catTo, catFrom;
					if ( catFrom.open(f->Data()->filePointer(), this->getAddonDir(), CATREAD_CATDECRYPT, false) == CATERR_NONE)
					{
						if ( catTo.open(findMatching->filePointer(), this->getAddonDir(), CATREAD_CATDECRYPT, false) == CATERR_NONE)
						{
							for (unsigned int i = 0; i < catFrom.GetNumFiles(); i++ )
							{
								SInCatFile *c = catFrom.GetFile(i);								 
								catTo.appendFile(f->Data()->filePointer() + L"::" + c->sFile, c->sFile);
							}
						}
					}
 
					// now remove the files

					}
				}
				// no matching file, then we shall just renaming back
				else
				{
					if ( f->Data()->baseName().left(5).Compare(L"fake_") )
					{
						shuffle = true;
						C_File *match = package->findMatchingMod(f->Data());
						Utils::String next = Utils::String::PadNumber(this->findNextFakePatch(), 2);
						

	}
 
	// if theres an icon, write it
	if (package->icon())
	{
		CLog::log(CLog::Log_Install, 3, L"Checking to install icon display file");
		C_File *icon = package->icon();
		if ( !icon->GetData() || !icon->GetDataSize() ) {
			package->setIcon(NULL, L"");
			CLog::log(CLog::Log_Install, 2, L"Unable to extract icon, clearing");
		}
		else
		{
			CDirIO Dir(m_sCurrentDir);
			bool ready = true;
			if ( !Dir.exists(L"PluginManager") )
			{
				if ( !Dir.create(L"PluginManager") )
					ready = false;
			}
			if ( ready && !Dir.exists(L"PluginManager/Icons") )
			{
				if ( !Dir.create(L"PluginManager/Icons") )
					ready = false;
			}
 
			if ( ready )
			{
				if ( !icon->UncompressData() )
					package->setIcon(NULL, L"");
				else
				{
					CFileIO iconFile(m_sCurrentDir + L"/PluginManager/Icons/" + package->author() + L"_" + package->name() + L"." + package->iconExt());
					if ( iconFile.WriteData((const char *)icon->GetData(), icon->GetDataSize()) )
					{
						icon->setFilename(package->author() + L"_" + package->name() + L"." + package->iconExt());
						icon->setFullDir(m_sCurrentDir + L"/PluginManager/Icons");
					}
					else
						package->setIcon(NULL, L"");
				}
			}
 
			if (package->icon())
				package->icon()->DeleteData();
		}
	}
 
	// remove all data
	CLog::log(CLog::Log_Install, 3, L"Clearing all unneeded file data");
	package->ClearFileData();
 
	// add to list
	if ( !dontAdd )
	{
		CLog::log(CLog::Log_Install, 1, L"Adding package into main list");
		if ( oldPackage )
		{
			// find all other packages that has the old package as parent and switch to new
			for(CListNode<CBaseFile> *node = m_lPackages.Front(); node; node = node->next()) {
				if ( node->Data()->GetParent() == oldPackage ) {

		}
		else
			m_lPackages.push_back (package);
	}
 
	CLog::log(CLog::Log_Install, 2, L"Updating file used count");
	UpdateUsedFiles();
 
	if ( disabled ) package->SetEnabled(false);
 
	// remove any files no longer used by old package
	if ( oldPackage )
	{
		CLog::log(CLog::Log_Install, 3, L"Removing any unused files from previous package");
 
		CListNode<C_File> *fnode = oldPackage->GetFileList()->Front();
		while ( fnode )
		{
			C_File *f = fnode->Data();

 
	}
 
	if ( shuffle )
	{
		CLog::log(CLog::Log_Install, 2, L"Shuffling Fake patches");
		shuffleFakePatches(errors);
		CLog::log(CLog::Log_Install, 2, L"Shuffling Text Files");
		shuffleTextFiles(errors);
	}
 
	// now we need to link any child/parent packages
	if ( package->GetType() == TYPE_SPK )

	}
 
	// store enabled mod
	if ( package->IsMod() && !disabled ) {
		m_pEnabledMod = package;
		CLog::log(CLog::Log_Install, 1, L"Setting package as primary mod");
	}
 
	package->updateTextDB();
 
	m_bRemoveDir = true;
 
	CLog::log(CLog::Log_Install, 1, L"Saving data to file");
	this->WriteData();
 
	CLog::log(CLog::Log_Install, 1, L"Installation Finished");
	return true;
}
 
bool CPackages::uninstallPreparedPackages(Utils::WStringList *errors, CProgressInfo *progress, CLinkList<CBaseFile> *uninstalledPackages, CLinkList<CBaseFile> *disabledPackages)
{

		CXspFile *p = (CXspFile *)pNode->Data();
 
		bool found = false;
		for ( CListNode<SGameShip> *wNode = m_lGameShips.Front(); wNode; wNode = wNode->next() )
		{
			if ( wNode->Data()->sShipID.Compare(p->GetShipID()) )
			{
				if ( !p->IsEnabled() )
					wNode->Data()->iType = WARETYPE_DISABLED;
				else
					wNode->Data()->iType = WARETYPE_ADDED;

		for ( CListNode<SGameShip> *wNode = m_lGameShips.Front(); wNode; wNode = wNode->next() )
		{
			if ( (!gw) && (wNode->Data()->iType == WARETYPE_NONE) )
				gw = wNode->Data();
			// find an old entry for the ware and add it to the same place
			if ( wNode->Data()->sShipID.Compare(p->GetShipID()) )
			{
				gw = wNode->Data();
				break;
			}
		}

	{
		// base mode for Reunion
		if ( m_iGame == GAME_X3 && m_pEnabledMod )
		{
			C_File *fDat = m_pEnabledMod->GetFirstFile(FILETYPE_MOD);
			while (fDat && !fDat->IsFakePatch() && !fDat->checkFileExt(L"dat"))
				fDat = m_pEnabledMod->GetNextFile(fDat);
 
			if ( fDat )
			{
				C_File *fCat = m_pEnabledMod->GetFirstFile(FILETYPE_MOD);

 
}
 
bool CPackages::RestoreFakePatch()
{
	CLog::log(CLog::Log_Directory, 1, L"Restoring PluginManager fake patch into game");
 	m_iFakePatch = -1;
 
	CFileIO catFile(m_sCurrentDir + L"/PluginManager/PlugMan_Fake.cat");
	CFileIO datFile(m_sCurrentDir + L"/PluginManager/PlugMan_Fake.dat");
 
	// if only 1 exists, remove it
	if ( catFile.exists() && !datFile.exists() ) {
		CLog::log(CLog::Log_Directory, 1, L"WARNING: cat/dat file mismatch, dat file seems to be missing, removing cat file");
		if ( !catFile.remove() ) return false;
	}
	else if ( !catFile.exists() && datFile.exists() ) {
		CLog::log(CLog::Log_Directory, 1, L"WARNING: cat/dat file mismatch, cat file seems to be missing, removing dat file");
		if ( !datFile.remove() ) return false;
	}
 
	// if both exists, lets rename them
	if ( catFile.exists() && datFile.exists() )
	{
		CLog::log(CLog::Log_Directory, 3, L"Creating pluginmanagerfake.txt file to add to Fake Patch");
		// we need to add the plugin manager file in
		Utils::WString file = m_sTempDir;
		if ( !file.empty() )
			file += L"/";
		file += L"pluginmanagerfake.txt";

		}
 
 
		// find next available fake patch
		m_iFakePatch = this->findNextFakePatch();
		CLog::log(CLog::Log_Directory, 2, L"Finding next available fake patch number: " + (long)m_iFakePatch);
 
		Utils::WString filename = Utils::WString::PadNumber(m_iFakePatch, 2);
		CLog::log(CLog::Log_Directory, 2, L"Renaming cat file to: " + filename + L".cat");
		if ( catFile.Rename(m_sCurrentDir + L"/" + filename + L".cat") )
		{

		if ( f->IsDisabled() )
			continue;
 
		// readmes, uninstall and extra files dont need to be disabled
		// Extra files not in the "Extras" directory could be anywhere, so these should be disabled incase they are game changing files, ie in "types"
		if ( f->GetFileType() == FILETYPE_README || f->GetFileType() == FILETYPE_UNINSTALL || (f->GetFileType() == FILETYPE_EXTRA && f->dir().left(5).lower() == L"Extra") )
			continue;
 
		// check if there is a matching uninstall file, ie there the script file is also an uninstall script file for a previously uninstalled package that has yet to be removed
		if ( f->GetFileType() == FILETYPE_SCRIPT )
		{

 
			if ( found )
				continue;
		}
 
		if ( f->GetFileType() == FILETYPE_MOD && !f->IsFakePatch() && f->checkFileExt(L"cat") )
		{
			if ( f->baseName().Compare(m_sSetMod.toString()) )
				m_sSetMod = Utils::WString::Null();
		}
 

	if (neededList)
	{
		for (CListNode<SNeededLibrary>* node = neededList->Front(); node; node = node->next())
		{
			SNeededLibrary* nl = node->Data();
			if (!checkInstalledDependacy((nl->sName.Compare(L"<package>")) ? p->name() : nl->sName, (nl->sAuthor.Compare(L"<author>")) ? p->author() : nl->sAuthor, nl->sMinVersion, (nl->sName.Compare(L"<package>")) ? false : onlyEnabled, (nl->sName.Compare(L"<package>")) ? false : includePrepared))
			{
				const SAvailablePackage *available = findAvailablePackage((nl->sName.Compare(L"<package>")) ? p->name() : nl->sName, (nl->sAuthor.Compare(L"<author>")) ? p->author() : nl->sAuthor);
				if (available)
					list.push_back(available);
				++count;
			}
		}

					found = false;
					for (CListNode<CBaseFile>* pNode = m_lInstallList.Front(); pNode; pNode = pNode->next())
					{
						CBaseFile* checkP = pNode->Data();
						if (p->author().Compare(checkP->author()) && p->name().Compare(checkP->name()))
						{
							found = true;
							break;
						}
					}
				}
				else
					found = false;
			}
 
			if (!found)
			{

						}
					}
				}
				else
					found = false;
			}
 
			if ( !found )
			{
				if ( list )
					list->pushBack(spk->GetOtherName(), spk->GetOtherAuthor());
				++count;

			missingDep = true;
		else if ( this->getMissingDependacies(p, NULL, false, true) )
			missingDep = true;
 
		if ( missingDep )
		{
			if ( list )
			{
				node->ChangeData(NULL);
				list->push_back(p);
			}

	}
 
	m_lUninstallFiles.RemoveEmpty();
 
	return files;
}
 
 
/**
 * Remove unused shared file
 *
 * Removes a single file
 */
bool CPackages::removeSharedFile(C_File *file, Utils::WStringList *errors)
{
	CFileIO fio(file->filePointer());

/**
 * Remove Unused Shared Files
 *
 * Files that have been marked as shared will not be removed or disabled when the last package is removed
 * This function will remove any that are no longer connected with packages
 *
 * Marked shared fiels are mainly used for library scripts that arn't always added to packages
 */
int CPackages::removeUnusedSharedFiles(Utils::WStringList *errors, CProgressInfo *progress)
{
	UpdateUsedFiles();

 
		C_File *file = node->Data();
 
		// only do marked shared files
		if ( !file->IsShared() )
			continue;
 
		// only do ones that are no longer needed
		if ( file->getUsed() )
			continue;
 
		if (removeSharedFile(file, errors) )
			++done;
		node->ChangeData(NULL);
	}
 
	m_lFiles.RemoveEmpty();
 
	return done;
}
 
/**
 * Any Unused Shared
 *
 * Checks if theres any unused shared files available
 *
 * Any file thats marked as shared, and is no longer connected to any installed package
 */
bool CPackages::AnyUnusedShared()
{
	UpdateUsedFiles();
 
	for ( CListNode<C_File> *node = m_lFiles.Back(); node; node = node->prev() )
	{
		C_File *file = node->Data();
 
		// only do marked shared files
		if ( !file->IsShared() )
			continue;
 
		// only do ones that are no longer needed
		if ( file->getUsed() )
			continue;
 
		return true;
	}
 
	return false;
 
}
 

		{
			CFileIO moveFile(f->filePointer());
	
			Utils::WString newName = SPK::FormatTextName(current, m_iLanguage, (m_iGameFlags & EXEFLAG_TCTEXT)) + L"." + moveFile.extension();
			if ( moveFile.Rename(m_sCurrentDir + L"/t/" + newName) )
			{
				this->addLogEntry(SPKINSTALL_AUTOTEXT, f->name() + L"~" + newName, errors);
				f->setName(newName.toString());
			}
			else
				this->addLogEntry(SPKINSTALL_AUTOTEXT_FAIL, f->name() + L"~" + newName, errors);

		if (spk)
		{
			if (spk->IsAnotherMod())
			{
				auto package = findPackage(spk->otherName(), spk->otherAuthor());
				if (package)
				{
					packagesBefore.insert(package);
					packagesAfter[p].insert(package);
				}
			}
		}
 
		if (!p->getFakePatchBeforeOrder().empty())

			for (auto itr = list.begin(); itr != list.end(); itr++)
			{
				auto package = findPackage((*itr)->str, (*itr)->data);
				if (package)				
					packagesAfter[package].insert(p);
			}
		}
		if (!p->getFakePatchAfterOrder().empty())
		{
			auto& list = p->getFakePatchAfterOrder();
			for (auto itr = list.begin(); itr != list.end(); itr++)
			{

					packagesAfter[p].insert(package);
				}
			}
		}
	}
 
	auto addOrderedList = [](const std::vector<CBaseFile*>& addList, const Utils::WStringList& orderList, std::vector<CBaseFile*>& addTo, const CPackages *packages)
	{
		// add all the items in the ordered list first
		for (auto itr = orderList.begin(); itr != orderList.end(); itr++)
		{

				addTo.push_back(*itr);
		}
	};
 
	auto removeList = [](const std::vector<CBaseFile*>& removeList, std::set<CBaseFile*>& list)
	{
		for (auto itr = removeList.begin(); itr != removeList.end(); itr++)
		{
			auto findItr = std::find(list.begin(), list.end(), *itr);
			if (findItr != list.end())
				list.erase(findItr);
		}
	};
 
	std::vector<CBaseFile*> order;
	while (!packagesBefore.empty())
	{
		std::vector<CBaseFile*> packagesOrder;
 

				bool notAdded = false;
				for (auto checkItr = findItr->second.begin(); checkItr != findItr->second.end(); checkItr++)
				{
					auto findItr2 = std::find(order.begin(), order.end(), *checkItr);
					if (findItr2 == order.end())
					{
						notAdded = true;
						break;
					}
				}
 
				if (!notAdded)
					packagesOrder.push_back(p);
			}
		}
 
 
		// no valid packages left ? lets just add the rest
		if (packagesOrder.empty())
		{
			for (auto itr = packagesBefore.begin(); itr != packagesBefore.end(); itr++)
				packagesOrder.push_back(*itr);
		}
 
		addOrderedList(packagesOrder, _lFakePatchOrder, order, this);

	// now add the remaining list ordered list
	for (auto itr = _lFakePatchOrder.begin(); itr != _lFakePatchOrder.end(); itr++)
	{
		auto p = findPackage((*itr)->str, (*itr)->data);
		if (p)
		{
			auto findItr = std::find(order.begin(), order.end(), p);
			if (findItr == order.end())
				order.push_back(p);
		}
	}
 
	for(auto itr = order.begin(); itr != order.end(); itr++)
	{
		CBaseFile *package = *itr;
		if ( package )
		{

						lowestFile = file;
					else
					{
						if ( file->baseName().toInt() < lowestFile->baseName().toInt() )
							lowestFile = file;
					}
				}
 
				if ( !lowestFile ) // no more files ?
					break;
 

		// check if the file is a fake patch
		if ( !f->IsFakePatch() )
			continue;
 
		// we only want cat and dat files, all fake patchs should be, but incase theres an error in the package somewhere we can check
		if (!f->checkFileExt(L"cat"))
			continue;
 
		// now lets check if its greater than our gap
		int check = findNextFakePatch();
		int patchNum = f->filename().token(L".", 1).toInt();

 
	int check = start;
	while ( check > 0 )
	{
		Utils::WString checkStr = Utils::String::PadNumber(check, 2);
 
		// check if a cat file exists
		if ( !Dir.exists(checkStr + L".cat") )
		{
			// it doen't, check if theres a dat file (incase of package error)
			if ( !Dir.exists(checkStr + L".dat") )
				break;
		}
		--check;
	}
 
	return check;
}
 
/**
 * Find next fake patch
 *
 * Searching for the next gap in patches, starting with 01.cat to 99.cat

		// check if a cat file exists
		if ( !Dir.exists(checkStr + L".cat") )
		{
			// it doen't, check if theres a dat file (incase of package error)
			if ( !Dir.exists(checkStr + L".dat") )
				break;
		}
	}
 
	return check;
}
 
/**
 * Find next text file
 *
 * Searching for the next gap in automatic text files, start with 0004-LXXX or XX0004
 */

 
	return check;
}
 
int CPackages::findLastTextFile(int start, const Utils::WString& dir) const
{
	CDirIO Dir((dir.empty()) ? m_sCurrentDir : dir);
	Dir.cd(L"t");
 
	int check = start;
	while ( check < 9999 )

		return;
 
	CDirIO Dir(m_sCurrentDir);
 
	// check for lang.dat file
	if ( Dir.exists(L"lang.dat") )
	{
		CFileIO File(Dir.file(L"lang.dat"));
 
		size_t size;
		char *data = File.ReadToData(&size);
 
		if ( data )

void CPackages::CreateLanguageTextFiles(Utils::WStringList *errors)
{
	// no need to create them if theres no language to use
	if ( !m_iLanguage )
		return;
 
	// find all text files
	Utils::WStringList ids;
 
	for ( CListNode<C_File> *node = m_lFiles.Front(); node; node = node->next() )
	{

 
		if ( !useId )
			useId = data[0].toInt();
		if ( !useId )
			useId = -1;
 
		renameTextFile((*itr)->str, useId, errors);
	}
}
 
/**

		{
			Utils::WString newLine = L"<language id=\"";
			newLine += Utils::WString::Number(m_iLanguage);
			newLine += L"\">";
			newLine += line.tokens(L">", 2);
 
			frontLines.insert(frontLines.begin(), newLine);
 
			lines.erase(lines.begin(), ++it);
			break;
		}

	{
		if ( !node->Data()->CheckGameCompatability(m_iGame) )
			continue;
		if ( onlyEnabled && !node->Data()->IsEnabled() )
			continue;
		if ( node->Data()->author().Compare(L"PluginManager") )
			++count;
	}
 
	return count;
}

	int lang = m_iLanguage;
	if ( !lang || lang < 0 )
		lang = 44;
 
	CDirIO Dir(m_sCurrentDir);
	if ( !Dir.exists(L"t") )
		Dir.create(L"t");
 
	Utils::WString filename = SPK::FormatTextName(PMTEXTFILE, lang, (m_iGameFlags & EXEFLAG_TCTEXT));
	CFileIO textFile(m_sCurrentDir + L"/t/" + filename + L".xml");
 
	std::vector<Utils::WString> writeData;

	this->Reset();
	m_bLoaded = false;
 
	// clear the plugin manager directory
	CDirIO Dir(m_sCurrentDir);
	Dir.removeDir(L"PluginManager", true, true, 0);
	Dir.removeDir(L"dds", false, true, 0);
	Dir.removeDir(L"objects", false, true, 0);
	Dir.removeDir(L"types", false, true, 0);
	Dir.removeDir(L"textures", false, true, 0);
 
	// remove the plugin manager mod files
	if ( Dir.exists(L"mods/PluginManager.cat") )	CFileIO::Remove(Dir.file(L"mods/PluginManager.cat"));
	if ( Dir.exists(L"mods/PluginManager.dat") )	CFileIO::Remove(Dir.file(L"mods/PluginManager.dat"));
 
	return true;
}
 
void CPackages::CreateDummies()

		return;
 
	CLinkList<SDummyEntry> dummyList;
 
	// now extract the existing dummies
	int e = extractGameFile(L"types/Dummies.pck", m_sTempDir + L"/Dummies.txt");
	if ( e )
	{
		// read the dummies
		CFileIO File;
		if ( File.open((e == -1) ? L"Dummies.txt" : m_sTempDir + L"/Dummies.txt") )
		{
			std::vector<Utils::String> lines;
			if(File.readLines(lines))
			{
				int insection = 0;

			}
		}
		lines.push_back("");
 
		// write the file to disk
		CFileIO WriteFile(m_sTempDir + L"/dummies.txt");
		if ( WriteFile.writeFile(&lines) )
		{
			this->packFile(&WriteFile, L"types\\dummies.pck");
			WriteFile.remove();
		}
	}
}
 

 
	if ( !found )
		return;
 
	std::vector<Utils::String> cutList;
	int e = extractGameFile(L"types/CutData.pck", m_sTempDir + L"/CutData.txt");
	if ( e )
	{
		CFileIO File;
		if ( File.open((e == -1) ? L"CutData.txt" : m_sTempDir + L"/CutData.txt") )
		{
 
			std::vector<Utils::String> lines;
			if(File.readLines(lines))
			{

	cutList.insert(cutList.begin(), Utils::String::Number(cutList.size()) + ";");
	cutList.insert(cutList.begin(), "/cut id;filename (leave blank to use id)");
	cutList.insert(cutList.begin(), "// Cut Data file, created by SPK Libraries V" + Utils::String::FromFloat(GetLibraryVersion(), 2));
 
	// write the file to disk
	CFileIO WriteFile(m_sTempDir + L"/CutData.txt");
	if ( WriteFile.writeFile(&cutList) )
	{
		this->packFile(&WriteFile, L"types\\CutData.pck");
		WriteFile.remove();
	}
}
 
void CPackages::CreateAnimations()

 
	formatedAniList.pushFront(Utils::String::Number(parsedAniList.size()) + ";");
	formatedAniList.pushFront("// Animations, created by SPK Libraries V" + Utils::String::FromFloat(GetLibraryVersion(), 2));
 
	// write the file to disk
	CFileIO WriteFile(m_sTempDir + L"/Animations.txt");
	if ( WriteFile.writeFile(&formatedAniList) )
	{
		this->packFile(&WriteFile, L"types\\Animations.pck");
		WriteFile.remove();
	}
}
 
void CPackages::CreateBodies()

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

		return;
 
	CLinkList<SComponantEntry> dummyList;
 
	// now extract the existing dummies
	int e = extractGameFile(L"types/Components.pck", m_sTempDir + L"/Components.txt");
	if ( e )
	{
		// read the dummies
		CFileIO File;
		if ( File.open((e == -1) ? L"Components.txt" : m_sTempDir + L"/Components.txt") )
		{
			std::vector<Utils::String> *lines = File.readLines();
			if ( lines )
			{
				int insection = 0;

				}
			}
		}
 
		// write the file to disk
		CFileIO WriteFile(m_sTempDir + L"/Components.txt");
		if ( WriteFile.writeFile(&lines) )
		{
			this->packFile(&WriteFile, L"types\\Components.pck");
			WriteFile.remove();
		}
	}
}
 

		Utils::WStringList writeList;
		for(auto itr = globals.begin(); itr != globals.end(); itr++)
			writeList.pushBack((*itr)->str + L";" + (*itr)->data + L";");
		
		// finally, write the file
		writeList.pushFront(Utils::WString::Number(writeList.size()) + L"; /globals amount", L"");
		writeList.pushFront(L"// Globals file, created by SPK Libraries V" + Utils::WString::FromFloat(GetLibraryVersion(), 2), L"");
 
		CFileIO WriteFile(m_sTempDir + L"/Globals.txt");
		if ( WriteFile.writeFile(&writeList) )
		{

			continue;
		shipOverrides.push_back(node->Data());
	}
 
	// read the existing tships file
	int e = extractGameFile(L"types/TShips.pck", m_sTempDir + L"/TShips.txt");
	if ( e )
	{
		int fileType = 51;
		std::vector<Utils::String> tshipsList;
 
		// if we have no buffer, lets create one
		CFileIO File;
		if ( File.open((e == -1) ? L"TShips.txt" : m_sTempDir + L"/TShips.txt") )
		{
			int shiptext = SHIPSTARTTEXT;
 
			std::vector<Utils::String> *lines = File.readLines();
			if ( lines )

 
			// finally, write the file
			tshipsList.insert(tshipsList.begin(), Utils::String::Number(fileType) + ";" + Utils::String::Number(tshipsList.size()) + ";");
			tshipsList.insert(tshipsList.begin(), "// TShips file, created by SPK Libraries V" + Utils::String::FromFloat(GetLibraryVersion(), 2));
 
			CFileIO WriteFile(m_sTempDir + L"/TShips.txt");
			if ( WriteFile.writeFile(&tshipsList) )
			{
				this->packFile(&WriteFile, L"types/TShips.pck");
				WriteFile.remove();
			}
		}
	}
 

	if ( m_lGameShips.empty() || !this->countPackages(TYPE_XSP, true) )
		return NULL;
 
	// now extract the existing cockpits
	int fileType = 51;
	int e = extractGameFile(L"types/TCockpits.pck", m_sTempDir + L"/TCockpits.txt");
	if ( e )
	{
		// read the dummies
		CFileIO File;
		if ( File.open((e == -1) ? L"TCockpits.txt" : m_sTempDir + L"/TCockpits.txt") )
		{
			std::vector<Utils::String> lines;
			if(File.readLines(lines))
			{
				int count = -1;

 
		// finally, write the file
		list.pushFront(Utils::String::Number(fileType) + ";" + Utils::String::Number(list.size()) + ";");
		list.pushFront("// TCockpits file, created by SPK Libraries V" + Utils::String::FromFloat(GetLibraryVersion(), 2));
 
		CFileIO WriteFile(m_sTempDir + L"/TCockpits.txt");
		if ( WriteFile.writeFile(&list) )
		{
			this->packFile(&WriteFile, L"types\\TCockpits.pck");
			WriteFile.remove();
		}
 
		// remove those entrys
		list.popFront();

					if (p->icon()->writeFilePointer())
						addedIcon = true;
				}
 
				if (!addedIcon)
					p->setIcon(NULL, L"");
			}
 
			// get an advert to display
			if (p->GetFirstFile(FILETYPE_ADVERT))
			{

	{
		CCatFile cat;
		if (cat.open(file, this->getAddonDir().toString(), CATREAD_CATDECRYPT, false) != CATERR_NONE)
			return false;
 
		if (!cat.extractFile(L"types\\TShips.pck", m_sTempDir + L"/tships.txt"))
			return false;
 
		File.open(m_sTempDir + L"/tships.txt");
		deleteFile = true;
	}
	// otherwise its a normal file
	else if (CFileIO(file).isFileExtension(L"pck"))
	{
		C_File f(file);
		if (!f.ReadFromFile())
			return false;
		f.UnPCKFile();
 
		f.setFilename(m_sTempDir + L"/tships.txt");
		if (!f.writeFilePointer())
			return false;
 
		File.open(m_sTempDir + L"/tships.txt");
		deleteFile = true;
	}
	else
		File.open(file);
 

				{
					int endpos = itr->findPos(L"\"", pos + 1);
					if ( endpos > -1 )
					{
						int id = itr->mid(pos + 2, endpos - pos - 1).toInt();
						pos = itr->findPos(L">", endpos);
						if ( pos > -1 )
						{
							++pos;
							endpos = itr->findPos(L"</", pos);
							if ( endpos > -1 )

 
	HeaderData.CmtBuf=NULL;
	memset(&OpenArchiveData.Reserved,0,sizeof(OpenArchiveData.Reserved));
 
	bool error = false;
	Utils::WString extractedFile = CDirIO(m_sTempDir).file(L"extracted.tst").findReplace(L"/", L"\\").findReplace(L"\\\\", L"\\");
	while ((RHCode=RARReadHeaderEx(hArcData,&HeaderData))==0)
	{
		Utils::WString fileName = HeaderData.FileName;
 
		if ( HeaderData.FileAttr == 16 )

Rev 212	Rev 213
Line 87...	Line 87...
87	`m_gameExe.getDirectoryData(_pCurrentDir);`	87	`m_gameExe.getDirectoryData(_pCurrentDir);`
88	`_pCurrentDir->langid = this->getGameLanguage(_pCurrentDir->dir.toString());`	88	`_pCurrentDir->langid = this->getGameLanguage(_pCurrentDir->dir.toString());`
89	`if (_pCurrentDir->langid > 0)`	89	`if (_pCurrentDir->langid > 0)`
90	`_pCurrentDir->langname = this->ConvertLanguage(_pCurrentDir->langid).toWString();`	90	`_pCurrentDir->langname = this->ConvertLanguage(_pCurrentDir->langid).toWString();`
91		91
92	`updateFoundPackages("");`	92	`updateFoundPackages(L"");`
93	`}`	93	`}`
94		94
95		95
96	`void CPackages::SetVanilla(bool b)`	96	`void CPackages::SetVanilla(bool b)`
97	`{`	97	`{`
Line 171...	Line 171...
171	`m_bRemoveDir = false;`	171	`m_bRemoveDir = false;`
172	`m_bDisableVanilla = false;`	172	`m_bDisableVanilla = false;`
173	`m_bSurpressProtectedWarning = false;`	173	`m_bSurpressProtectedWarning = false;`
174	`m_iSaveGame = -1;`	174	`m_iSaveGame = -1;`
175	`m_iSaveGameManager = -1;`	175	`m_iSaveGameManager = -1;`
176	`m_sSetMod = "";`	176	`m_sSetMod = L"";`
177		177
178	`for ( int i = 0; i < WAREBUFFERS; i++ )`	178	`for ( int i = 0; i < WAREBUFFERS; i++ )`
179	`{`	179	`{`
180	`m_iWareBuffer[i] = 0;`	180	`m_iWareBuffer[i] = 0;`
181	`m_lGameWares[i].MemoryClear();`	181	`m_lGameWares[i].MemoryClear();`
Line 208...	Line 208...
208	`{`	208	`{`
209	`C_File *f;`	209	`C_File *f;`
210	`for ( f = m_pEnabledMod->GetFirstFile(FILETYPE_MOD); f; f = m_pEnabledMod->GetNextFile(f) )`	210	`for ( f = m_pEnabledMod->GetFirstFile(FILETYPE_MOD); f; f = m_pEnabledMod->GetNextFile(f) )`
211	`{`	211	`{`
212	`if (f->IsFakePatch()) continue;`	212	`if (f->IsFakePatch()) continue;`
213	`if (f->checkFileExt("cat")) break;`	213	`if (f->checkFileExt(L"cat")) break;`
214	`}`	214	`}`
215		215
216	`if ( f )`	216	`if ( f )`
217	`m_pGameVFS.LoadFilesystem(m_sCurrentDir, f->filePointer(), 0);`	217	`m_pGameVFS.LoadFilesystem(m_sCurrentDir, f->filePointer(), 0);`
218	`else`	218	`else`
Line 253...	Line 253...
253	`}`	253	`}`
254		254
255	`bool CPackages::read(const Utils::WString& dir, CProgressInfo* progress)`	255	`bool CPackages::read(const Utils::WString& dir, CProgressInfo* progress)`
256	`{`	256	`{`
257	`m_sCurrentDir = dir;`	257	`m_sCurrentDir = dir;`
258	`m_sCurrentDir = m_sCurrentDir.findReplace("\\", "/");`	258	`m_sCurrentDir = m_sCurrentDir.findReplace(L"\\", L"/");`
259	`this->setCurrentDir(dir);`	259	`this->setCurrentDir(dir);`
260	`m_bOldPlugin = false;`	260	`m_bOldPlugin = false;`
261	`_lCreatedFiles.clear();`	261	`_lCreatedFiles.clear();`
262	`m_bRemoveDir = false;`	262	`m_bRemoveDir = false;`
263	`m_bSurpressProtectedWarning = false;`	263	`m_bSurpressProtectedWarning = false;`
Line 818...	Line 818...
818	`{`	818	`{`
819	`Utils::WString useAddonDir = addonDir;`	819	`Utils::WString useAddonDir = addonDir;`
820	`if ( !useAddonDir.empty() ) useAddonDir += L"\\";`	820	`if ( !useAddonDir.empty() ) useAddonDir += L"\\";`
821	`for (auto itr = files->cbegin(); itr != files->cend(); itr++)`	821	`for (auto itr = files->cbegin(); itr != files->cend(); itr++)`
822	`{`	822	`{`
823	`if ((*itr)->sFile.Compare("PlugMan\\TFake.pck") )`	823	`if ((*itr)->sFile.Compare(L"PlugMan\\TFake.pck") )`
824	`continue;`	824	`continue;`
825	`if ((*itr)->sFile.Compare(useAddonDir.toString() + "t\\44" + Utils::String::PadNumber(PMTEXTFILE, 4) + ".pck"))`	825	`if ((*itr)->sFile.Compare(useAddonDir + L"t\\44" + Utils::WString::PadNumber(PMTEXTFILE, 4) + L".pck"))`
826	`continue;`	826	`continue;`
827	`if ((*itr)->sFile.Compare(useAddonDir.toString() + "t\\" + Utils::String::PadNumber(PMTEXTFILE, 4) + "-L044.pck"))`	827	`if ((*itr)->sFile.Compare(useAddonDir + L"t\\" + Utils::WString::PadNumber(PMTEXTFILE, 4) + L"-L044.pck"))`
828	`continue;`	828	`continue;`
829		829
830	`found = true;`	830	`found = true;`
831	`break;`	831	`break;`
832	`}`	832	`}`
Line 843...	Line 843...
843	`return true;`	843	`return true;`
844	`}`	844	`}`
845	`}`	845	`}`
846	`else`	846	`else`
847	`{`	847	`{`
848	`if ( catFile.Rename(m_sCurrentDir + "/PluginManager/PlugMan_Fake.cat") )`	848	`if ( catFile.Rename(m_sCurrentDir + L"/PluginManager/PlugMan_Fake.cat") )`
849	`{`	849	`{`
850	`CFileIO datFile(m_sCurrentDir + L"/" + useFile + L".dat");`	850	`CFileIO datFile(m_sCurrentDir + L"/" + useFile + L".dat");`
851		851
852	`if ( datFile.Rename(m_sCurrentDir + "/PluginManager/PlugMan_Fake.dat") )`	852	`if ( datFile.Rename(m_sCurrentDir + L"/PluginManager/PlugMan_Fake.dat") )`
853	`return true;`	853	`return true;`
854		854
855	`// TODO: it failed, restore cat file and do error`	855	`// TODO: it failed, restore cat file and do error`
856	`}`	856	`}`
857	`}`	857	`}`
Line 860...	Line 860...
860	`// if we're here, we tryed, and failed`	860	`// if we're here, we tryed, and failed`
861	`return false;`	861	`return false;`
862	`}`	862	`}`
863	`// no files found, but we have a fake patch ? restore from backup`	863	`// no files found, but we have a fake patch ? restore from backup`
864	`else if ( m_iFakePatch > 0 ) {`	864	`else if ( m_iFakePatch > 0 ) {`
865	`CLog::log(CLog::Log_Directory, 1, "PlugMan FakePatch seems to be missing (" + Utils::String::Number(m_iFakePatch) + "), Restoring from backup");`	865	`CLog::log(CLog::Log_Directory, 1, L"PlugMan FakePatch seems to be missing (" + Utils::WString::Number(m_iFakePatch) + L"), Restoring from backup");`
866	`CFileIO catFile(m_sCurrentDir + "/PluginManager/Backup/PlugMan_Fake.cat");`	866	`CFileIO catFile(m_sCurrentDir + L"/PluginManager/Backup/PlugMan_Fake.cat");`
867	`if ( catFile.exists() ) {`	867	`if ( catFile.exists() ) {`
868	`catFile.copy(m_sCurrentDir + "/PluginManager/PlugMan_Fake.cat");`	868	`catFile.copy(m_sCurrentDir + L"/PluginManager/PlugMan_Fake.cat");`
869	`CFileIO datFile(m_sCurrentDir + "/PluginManager/Backup/PlugMan_Fake.dat");`	869	`CFileIO datFile(m_sCurrentDir + L"/PluginManager/Backup/PlugMan_Fake.dat");`
870	`if ( datFile.exists() ) datFile.copy(m_sCurrentDir + "/PluginManager/PlugMan_Fake.dat");`	870	`if ( datFile.exists() ) datFile.copy(m_sCurrentDir + L"/PluginManager/PlugMan_Fake.dat");`
871	`}`	871	`}`
872	`}`	872	`}`
873		873
874	`// otherwise we didn't need to (hopefully)`	874	`// otherwise we didn't need to (hopefully)`
875	`return true;`	875	`return true;`
Line 919...	Line 919...
919	`if ( catFile.exists() && CFileIO::Exists(m_sCurrentDir + L"/" + filename + L".dat"))`	919	`if ( catFile.exists() && CFileIO::Exists(m_sCurrentDir + L"/" + filename + L".dat"))`
920	`{`	920	`{`
921	`CCatFile openFile;`	921	`CCatFile openFile;`
922	`if ( openFile.open(catFile.fullFilename(), this->getAddonDir(), CATREAD_CATDECRYPT, false) == CATERR_NONE)`	922	`if ( openFile.open(catFile.fullFilename(), this->getAddonDir(), CATREAD_CATDECRYPT, false) == CATERR_NONE)`
923	`{`	923	`{`
924	`if ( openFile.findData("PlugMan\\TFake.pck") )`	924	`if ( openFile.findData(L"PlugMan\\TFake.pck") )`
925	`return true;`	925	`return true;`
926	`if ( openFile.findData("pluginmanagerfake.pck") )`	926	`if ( openFile.findData(L"pluginmanagerfake.pck") )`
927	`return true;`	927	`return true;`
928	`}`	928	`}`
929	`}`	929	`}`
930		930
931	`return false;`	931	`return false;`
Line 952...	Line 952...
952	`gNode->Data()->iVersion = version;`	952	`gNode->Data()->iVersion = version;`
953	`}`	953	`}`
954	`}`	954	`}`
955	`}`	955	`}`
956		956
957	`if ( package->forumLink().empty() && package->webSite().isin("forum.egosoft")) {`	957	`if ( package->forumLink().empty() && package->webSite().contains(L"forum.egosoft")) {`
958	`package->setForumLink(package->webSite());`	958	`package->setForumLink(package->webSite());`
959	`package->setWebSite("");`	959	`package->setWebSite(L"");`
960	`}`	960	`}`
961		961
962	`// convert the version`	962	`// convert the version`
963	`if ( package->GetType() == TYPE_SPK )`	963	`if ( package->GetType() == TYPE_SPK )`
964	`{`	964	`{`
Line 1028...	Line 1028...
1028	`// any extra files that are in director folder`	1028	`// any extra files that are in director folder`
1029	`if ( package->AnyFileType(FILETYPE_EXTRA) )`	1029	`if ( package->AnyFileType(FILETYPE_EXTRA) )`
1030	`{`	1030	`{`
1031	`for ( C_File *f = package->GetFirstFile(FILETYPE_EXTRA); f; f = package->GetNextFile(f) )`	1031	`for ( C_File *f = package->GetFirstFile(FILETYPE_EXTRA); f; f = package->GetNextFile(f) )`
1032	`{`	1032	`{`
1033	`if ( !f->dir().Compare("director") )`	1033	`if ( !f->dir().Compare(L"director") )`
1034	`continue;`	1034	`continue;`
1035	`if (f->checkFileExt("xml") \|\| f->checkFileExt("pck"))`	1035	`if (f->checkFileExt(L"xml") \|\| f->checkFileExt(L"pck"))`
1036	`{`	1036	`{`
1037	`f->setDir("");`	1037	`f->setDir(L"");`
1038	`f->setFileType(FILETYPE_MISSION);`	1038	`f->setFileType(FILETYPE_MISSION);`
1039	`}`	1039	`}`
1040	`}`	1040	`}`
1041	`}`	1041	`}`
1042	`}`	1042	`}`
Line 1386...	Line 1386...
1386	`}`	1386	`}`
1387	`if ( CCatFile::IsAddonDir(f->Data()->getNameDirectory(pPackage)) ) {`	1387	`if ( CCatFile::IsAddonDir(f->Data()->getNameDirectory(pPackage)) ) {`
1388	`continue;`	1388	`continue;`
1389	`}`	1389	`}`
1390	`// check if its already in the fake patch`	1390	`// check if its already in the fake patch`
1391	`if ( f->Data()->fullDir().contains("::") ) {`	1391	`if ( f->Data()->fullDir().contains(L"::") ) {`
1392	`continue;`	1392	`continue;`
1393	`}`	1393	`}`
1394	`Utils::WString toFile;`	1394	`Utils::WString toFile;`
1395	`if ( cat.appendFile(f->Data()->filePointer(), f->Data()->getNameDirectory(pPackage), true, (m_iGameFlags & EXEFLAG_NOXOR) ? false : true, &toFile) ) {`	1395	`if ( cat.appendFile(f->Data()->filePointer(), f->Data()->getNameDirectory(pPackage), true, (m_iGameFlags & EXEFLAG_NOXOR) ? false : true, &toFile) ) {`
1396	`CLog::logf(CLog::Log_Install, 2, "Adding file: %s into the fake patch", f->Data()->getNameDirectory(pPackage).c_str());`	1396	`CLog::logf(CLog::Log_Install, 2, "Adding file: %s into the fake patch", f->Data()->getNameDirectory(pPackage).c_str());`
Line 1406...	Line 1406...
1406	`bool prevDisabled = disabled;`	1406	`bool prevDisabled = disabled;`
1407		1407
1408	`// first check if we are installed a mod`	1408	`// first check if we are installed a mod`
1409	`if ( package->IsMod() && m_pEnabledMod && !m_bForceModInstall ) {`	1409	`if ( package->IsMod() && m_pEnabledMod && !m_bForceModInstall ) {`
1410	`disabled = true;`	1410	`disabled = true;`
1411	`CLog::log(CLog::Log_Install, 2, "Package is a mod and another mod is already enabled, setting to disabled");`	1411	`CLog::log(CLog::Log_Install, 2, L"Package is a mod and another mod is already enabled, setting to disabled");`
1412	`}`	1412	`}`
1413	`// if vanilla nad package aint signed`	1413	`// if vanilla nad package aint signed`
1414	`if ( m_bVanilla && !package->IsSigned() ) {`	1414	`if ( m_bVanilla && !package->IsSigned() ) {`
1415	`disabled = true;`	1415	`disabled = true;`
1416	`CLog::log(CLog::Log_Install, 2, "Package is a not signed and are we in vanilla mode, setting to disabled");`	1416	`CLog::log(CLog::Log_Install, 2, L"Package is a not signed and are we in vanilla mode, setting to disabled");`
1417	`}`	1417	`}`
1418		1418
1419	`// check any depancies`	1419	`// check any depancies`
1420	`if ( !disabled && !this->CheckEnabledDependacy(package) ) {`	1420	`if ( !disabled && !this->CheckEnabledDependacy(package) ) {`
1421	`disabled = true;`	1421	`disabled = true;`
1422	`CLog::log(CLog::Log_Install, 2, "Dependacies missing for package, setting to disabled");`	1422	`CLog::log(CLog::Log_Install, 2, L"Dependacies missing for package, setting to disabled");`
1423	`}`	1423	`}`
1424		1424
1425	`// search for an old version`	1425	`// search for an old version`
1426	`if ( oldPackage && oldPackage == m_pEnabledMod && disabled )`	1426	`if ( oldPackage && oldPackage == m_pEnabledMod && disabled )`
1427	`disabled = prevDisabled;`	1427	`disabled = prevDisabled;`
Line 1445...	Line 1445...
1445	`// update packages must have an old package installed already (should have been checked for already)`	1445	`// update packages must have an old package installed already (should have been checked for already)`
1446	`if ( package->GetType() == TYPE_SPK )`	1446	`if ( package->GetType() == TYPE_SPK )`
1447	`{`	1447	`{`
1448	`if ( ((CSpkFile *)package)->IsPackageUpdate() )`	1448	`if ( ((CSpkFile *)package)->IsPackageUpdate() )`
1449	`{`	1449	`{`
1450	`CLog::log(CLog::Log_Install, 3, "Package is an Update, checking for existing package installed");`	1450	`CLog::log(CLog::Log_Install, 3, L"Package is an Update, checking for existing package installed");`
1451	`if ( !oldPackage ) {`	1451	`if ( !oldPackage ) {`
1452	`CLog::log(CLog::Log_Install, 2, "Package is an Update but no existing package found, cancelling install");`	1452	`CLog::log(CLog::Log_Install, 2, L"Package is an Update but no existing package found, cancelling install");`
1453	`return false;`	1453	`return false;`
1454	`}`	1454	`}`
1455	`// change any mods to temp ones`	1455	`// change any mods to temp ones`
1456	`for ( CListNode<C_File> *f = package->GetFileList()->Front(); f; f = f->next() )`	1456	`for ( CListNode<C_File> *f = package->GetFileList()->Front(); f; f = f->next() )`
1457	`{`	1457	`{`
1458	`if ( f->Data()->GetFileType() != FILETYPE_MOD )`	1458	`if ( f->Data()->GetFileType() != FILETYPE_MOD )`
1459	`continue;`	1459	`continue;`
1460		1460
1461	`f->Data()->setDir("temp");`	1461	`f->Data()->setDir(L"temp");`
1462	`if ( f->Data()->IsFakePatch() ) {`	1462	`if ( f->Data()->IsFakePatch() ) {`
1463	`CLog::logf(CLog::Log_Install, 2, "Moving fake package to temporary location to preper for update, %s", f->Data()->filePointer().c_str());`	1463	`CLog::logf(CLog::Log_Install, 2, "Moving fake package to temporary location to preper for update, %s", f->Data()->filePointer().c_str());`
1464	`f->Data()->setName("Fake_" + f->Data()->name());`	1464	`f->Data()->setName(L"Fake_" + f->Data()->name());`
1465	`}`	1465	`}`
1466	`}`	1466	`}`
1467	`}`	1467	`}`
1468	`}`	1468	`}`
1469		1469
1470	`// no need to backup if we're disabling them`	1470	`// no need to backup if we're disabling them`
1471	`if ( !disabled )`	1471	`if ( !disabled )`
1472	`{`	1472	`{`
1473	`// find any uninstall files and remove them`	1473	`// find any uninstall files and remove them`
1474	`CLog::log(CLog::Log_Install, 3, "Purging uninstall scripts");`	1474	`CLog::log(CLog::Log_Install, 3, L"Purging uninstall scripts");`
1475	`this->purgeUninstallScripts(package, errors);`	1475	`this->purgeUninstallScripts(package, errors);`
1476		1476
1477	`// backup any original files before installing`	1477	`// backup any original files before installing`
1478	`_pOriginalFiles->backup(package, errors);`	1478	`_pOriginalFiles->backup(package, errors);`
1479	`}`	1479	`}`
1480		1480
1481	`// install all the files`	1481	`// install all the files`
1482	`CLog::log(CLog::Log_Install, 3, "Checking for any existing files");`	1482	`CLog::log(CLog::Log_Install, 3, L"Checking for any existing files");`
1483	`if ( oldPackage )`	1483	`if ( oldPackage )`
1484	`{`	1484	`{`
1485	`CLog::logf(CLog::Log_Install, 3, "Excluding existing package (%s) from file check list", oldPackage->version().c_str());`	1485	`CLog::logf(CLog::Log_Install, 3, "Excluding existing package (%s) from file check list", oldPackage->version().c_str());`
1486	`CLinkList<CBaseFile> excludeList;`	1486	`CLinkList<CBaseFile> excludeList;`
1487	`excludeList.push_back(oldPackage);`	1487	`excludeList.push_back(oldPackage);`
1488	`this->UpdateUsedFiles(&excludeList, true);`	1488	`this->UpdateUsedFiles(&excludeList, true);`
1489	`}`	1489	`}`
1490	`else`	1490	`else`
1491	`this->UpdateUsedFiles(0, true);`	1491	`this->UpdateUsedFiles(0, true);`
1492		1492
1493	`CLog::log(CLog::Log_Install, 3, "Reading all files into memory");`	1493	`CLog::log(CLog::Log_Install, 3, L"Reading all files into memory");`
1494	`package->ReadAllFilesToMemory();`	1494	`package->ReadAllFilesToMemory();`
1495		1495
1496	`CLog::log(CLog::Log_Install, 3, "Starting to install files");`	1496	`CLog::log(CLog::Log_Install, 3, L"Starting to install files");`
1497	`if ( !package->installFiles (m_sCurrentDir.toString(), progress, &m_lFiles, errors, !disabled, this))`	1497	`if ( !package->installFiles (m_sCurrentDir.toString(), progress, &m_lFiles, errors, !disabled, this))`
1498	`{`	1498	`{`
1499	`CLog::log(CLog::Log_Install, 2, "There was an error installing files!!");`	1499	`CLog::log(CLog::Log_Install, 2, L"There was an error installing files!!");`
1500		1500
1501	`// TODO: clear up installed files`	1501	`// TODO: clear up installed files`
1502	`return false;`	1502	`return false;`
1503	`}`	1503	`}`
1504		1504
Line 1521...	Line 1521...
1521	`if ( !f->Data() )`	1521	`if ( !f->Data() )`
1522	`continue;`	1522	`continue;`
1523	`if ( f->Data()->GetFileType() != FILETYPE_MOD )`	1523	`if ( f->Data()->GetFileType() != FILETYPE_MOD )`
1524	`continue;`	1524	`continue;`
1525	`// we only need the cat file`	1525	`// we only need the cat file`
1526	`if (!f->Data()->checkFileExt("cat"))`	1526	`if (!f->Data()->checkFileExt(L"cat"))`
1527	`continue;`	1527	`continue;`
1528		1528
1529	`// if fake patch, find first fake patch in package`	1529	`// if fake patch, find first fake patch in package`
1530	`C_File *findMatching = NULL;`	1530	`C_File *findMatching = NULL;`
1531	`if ( f->Data()->baseName().left(5).Compare("fake_") )`	1531	`if ( f->Data()->baseName().left(5).Compare(L"fake_") )`
1532	`{`	1532	`{`
1533	`for ( CListNode<C_File> *node = oldPackage->GetFileList()->Front(); node; node = node->next() )`	1533	`for ( CListNode<C_File> *node = oldPackage->GetFileList()->Front(); node; node = node->next() )`
1534	`{`	1534	`{`
1535	`if ( !node->Data() )`	1535	`if ( !node->Data() )`
1536	`continue;`	1536	`continue;`
1537	`if ( node->Data()->GetFileType() != FILETYPE_MOD )`	1537	`if ( node->Data()->GetFileType() != FILETYPE_MOD )`
1538	`continue;`	1538	`continue;`
1539	`// we only need the cat file`	1539	`// we only need the cat file`
1540	`if ( !node->Data()->checkFileExt("cat") )`	1540	`if ( !node->Data()->checkFileExt(L"cat") )`
1541	`continue;`	1541	`continue;`
1542	`if ( !node->Data()->IsFakePatch() )`	1542	`if ( !node->Data()->IsFakePatch() )`
1543	`continue;`	1543	`continue;`
1544		1544
1545	`findMatching = node->Data();`	1545	`findMatching = node->Data();`
Line 1554...	Line 1554...
1554	`if ( !node->Data() )`	1554	`if ( !node->Data() )`
1555	`continue;`	1555	`continue;`
1556	`if ( node->Data()->GetFileType() != FILETYPE_MOD )`	1556	`if ( node->Data()->GetFileType() != FILETYPE_MOD )`
1557	`continue;`	1557	`continue;`
1558	`// we only need the cat file`	1558	`// we only need the cat file`
1559	`if (!node->Data()->checkFileExt("cat"))`	1559	`if (!node->Data()->checkFileExt(L"cat"))`
1560	`continue;`	1560	`continue;`
1561		1561
1562	`if ( node->Data()->name().Compare(f->Data()->name()) )`	1562	`if ( node->Data()->name().Compare(f->Data()->name()) )`
1563	`{`	1563	`{`
1564	`findMatching = node->Data();`	1564	`findMatching = node->Data();`
Line 1569...	Line 1569...
1569		1569
1570	`if ( findMatching )`	1570	`if ( findMatching )`
1571	`{`	1571	`{`
1572	`// copy accross all mods`	1572	`// copy accross all mods`
1573	`CCatFile catTo, catFrom;`	1573	`CCatFile catTo, catFrom;`
1574	`if ( catFrom.open(f->Data()->filePointer(), this->getAddonDir().toString(), CATREAD_CATDECRYPT, false) == CATERR_NONE)`	1574	`if ( catFrom.open(f->Data()->filePointer(), this->getAddonDir(), CATREAD_CATDECRYPT, false) == CATERR_NONE)`
1575	`{`	1575	`{`
1576	`if ( catTo.open(findMatching->filePointer(), this->getAddonDir().toString(), CATREAD_CATDECRYPT, false) == CATERR_NONE)`	1576	`if ( catTo.open(findMatching->filePointer(), this->getAddonDir(), CATREAD_CATDECRYPT, false) == CATERR_NONE)`
1577	`{`	1577	`{`
1578	`for (unsigned int i = 0; i < catFrom.GetNumFiles(); i++ )`	1578	`for (unsigned int i = 0; i < catFrom.GetNumFiles(); i++ )`
1579	`{`	1579	`{`
1580	`SInCatFile *c = catFrom.GetFile(i);`	1580	`SInCatFile *c = catFrom.GetFile(i);`
1581	`catTo.appendFile(f->Data()->filePointer() + "::" + c->sFile, c->sFile);`	1581	`catTo.appendFile(f->Data()->filePointer() + L"::" + c->sFile, c->sFile);`
1582	`}`	1582	`}`
1583	`}`	1583	`}`
1584	`}`	1584	`}`
1585		1585
1586	`// now remove the files`	1586	`// now remove the files`
Line 1598...	Line 1598...
1598	`}`	1598	`}`
1599	`}`	1599	`}`
1600	`// no matching file, then we shall just renaming back`	1600	`// no matching file, then we shall just renaming back`
1601	`else`	1601	`else`
1602	`{`	1602	`{`
1603	`if ( f->Data()->baseName().left(5).Compare("fake_") )`	1603	`if ( f->Data()->baseName().left(5).Compare(L"fake_") )`
1604	`{`	1604	`{`
1605	`shuffle = true;`	1605	`shuffle = true;`
1606	`C_File *match = package->findMatchingMod(f->Data());`	1606	`C_File *match = package->findMatchingMod(f->Data());`
1607	`Utils::String next = Utils::String::PadNumber(this->findNextFakePatch(), 2);`	1607	`Utils::String next = Utils::String::PadNumber(this->findNextFakePatch(), 2);`
1608		1608
Line 1651...	Line 1651...
1651	`}`	1651	`}`
1652		1652
1653	`// if theres an icon, write it`	1653	`// if theres an icon, write it`
1654	`if (package->icon())`	1654	`if (package->icon())`
1655	`{`	1655	`{`
1656	`CLog::log(CLog::Log_Install, 3, "Checking to install icon display file");`	1656	`CLog::log(CLog::Log_Install, 3, L"Checking to install icon display file");`
1657	`C_File *icon = package->icon();`	1657	`C_File *icon = package->icon();`
1658	`if ( !icon->GetData() \|\| !icon->GetDataSize() ) {`	1658	`if ( !icon->GetData() \|\| !icon->GetDataSize() ) {`
1659	`package->setIcon(NULL, "");`	1659	`package->setIcon(NULL, L"");`
1660	`CLog::log(CLog::Log_Install, 2, "Unable to extract icon, clearing");`	1660	`CLog::log(CLog::Log_Install, 2, L"Unable to extract icon, clearing");`
1661	`}`	1661	`}`
1662	`else`	1662	`else`
1663	`{`	1663	`{`
1664	`CDirIO Dir(m_sCurrentDir);`	1664	`CDirIO Dir(m_sCurrentDir);`
1665	`bool ready = true;`	1665	`bool ready = true;`
1666	`if ( !Dir.exists("PluginManager") )`	1666	`if ( !Dir.exists(L"PluginManager") )`
1667	`{`	1667	`{`
1668	`if ( !Dir.create("PluginManager") )`	1668	`if ( !Dir.create(L"PluginManager") )`
1669	`ready = false;`	1669	`ready = false;`
1670	`}`	1670	`}`
1671	`if ( ready && !Dir.exists("PluginManager/Icons") )`	1671	`if ( ready && !Dir.exists(L"PluginManager/Icons") )`
1672	`{`	1672	`{`
1673	`if ( !Dir.create("PluginManager/Icons") )`	1673	`if ( !Dir.create(L"PluginManager/Icons") )`
1674	`ready = false;`	1674	`ready = false;`
1675	`}`	1675	`}`
1676		1676
1677	`if ( ready )`	1677	`if ( ready )`
1678	`{`	1678	`{`
1679	`if ( !icon->UncompressData() )`	1679	`if ( !icon->UncompressData() )`
1680	`package->setIcon(NULL, "");`	1680	`package->setIcon(NULL, L"");`
1681	`else`	1681	`else`
1682	`{`	1682	`{`
1683	`CFileIO iconFile(m_sCurrentDir + L"/PluginManager/Icons/" + package->author() + L"_" + package->name() + L"." + package->iconExt());`	1683	`CFileIO iconFile(m_sCurrentDir + L"/PluginManager/Icons/" + package->author() + L"_" + package->name() + L"." + package->iconExt());`
1684	`if ( iconFile.WriteData((const char *)icon->GetData(), icon->GetDataSize()) )`	1684	`if ( iconFile.WriteData((const char *)icon->GetData(), icon->GetDataSize()) )`
1685	`{`	1685	`{`
1686	`icon->setFilename(package->author() + L"_" + package->name() + L"." + package->iconExt());`	1686	`icon->setFilename(package->author() + L"_" + package->name() + L"." + package->iconExt());`
1687	`icon->setFullDir(m_sCurrentDir + L"/PluginManager/Icons");`	1687	`icon->setFullDir(m_sCurrentDir + L"/PluginManager/Icons");`
1688	`}`	1688	`}`
1689	`else`	1689	`else`
1690	`package->setIcon(NULL, "");`	1690	`package->setIcon(NULL, L"");`
1691	`}`	1691	`}`
1692	`}`	1692	`}`
1693		1693
1694	`if (package->icon())`	1694	`if (package->icon())`
1695	`package->icon()->DeleteData();`	1695	`package->icon()->DeleteData();`
1696	`}`	1696	`}`
1697	`}`	1697	`}`
1698		1698
1699	`// remove all data`	1699	`// remove all data`
1700	`CLog::log(CLog::Log_Install, 3, "Clearing all unneeded file data");`	1700	`CLog::log(CLog::Log_Install, 3, L"Clearing all unneeded file data");`
1701	`package->ClearFileData();`	1701	`package->ClearFileData();`
1702		1702
1703	`// add to list`	1703	`// add to list`
1704	`if ( !dontAdd )`	1704	`if ( !dontAdd )`
1705	`{`	1705	`{`
1706	`CLog::log(CLog::Log_Install, 1, "Adding package into main list");`	1706	`CLog::log(CLog::Log_Install, 1, L"Adding package into main list");`
1707	`if ( oldPackage )`	1707	`if ( oldPackage )`
1708	`{`	1708	`{`
1709	`// find all other packages that has the old package as parent and switch to new`	1709	`// find all other packages that has the old package as parent and switch to new`
1710	`for(CListNode<CBaseFile> *node = m_lPackages.Front(); node; node = node->next()) {`	1710	`for(CListNode<CBaseFile> *node = m_lPackages.Front(); node; node = node->next()) {`
1711	`if ( node->Data()->GetParent() == oldPackage ) {`	1711	`if ( node->Data()->GetParent() == oldPackage ) {`
Line 1719...	Line 1719...
1719	`}`	1719	`}`
1720	`else`	1720	`else`
1721	`m_lPackages.push_back (package);`	1721	`m_lPackages.push_back (package);`
1722	`}`	1722	`}`
1723		1723
1724	`CLog::log(CLog::Log_Install, 2, "Updating file used count");`	1724	`CLog::log(CLog::Log_Install, 2, L"Updating file used count");`
1725	`UpdateUsedFiles();`	1725	`UpdateUsedFiles();`
1726		1726
1727	`if ( disabled ) package->SetEnabled(false);`	1727	`if ( disabled ) package->SetEnabled(false);`
1728		1728
1729	`// remove any files no longer used by old package`	1729	`// remove any files no longer used by old package`
1730	`if ( oldPackage )`	1730	`if ( oldPackage )`
1731	`{`	1731	`{`
1732	`CLog::log(CLog::Log_Install, 3, "Removing any unused files from previous package");`	1732	`CLog::log(CLog::Log_Install, 3, L"Removing any unused files from previous package");`
1733		1733
1734	`CListNode<C_File> *fnode = oldPackage->GetFileList()->Front();`	1734	`CListNode<C_File> *fnode = oldPackage->GetFileList()->Front();`
1735	`while ( fnode )`	1735	`while ( fnode )`
1736	`{`	1736	`{`
1737	`C_File *f = fnode->Data();`	1737	`C_File *f = fnode->Data();`
Line 1766...	Line 1766...
1766		1766
1767	`}`	1767	`}`
1768		1768
1769	`if ( shuffle )`	1769	`if ( shuffle )`
1770	`{`	1770	`{`
1771	`CLog::log(CLog::Log_Install, 2, "Shuffling Fake patches");`	1771	`CLog::log(CLog::Log_Install, 2, L"Shuffling Fake patches");`
1772	`shuffleFakePatches(errors);`	1772	`shuffleFakePatches(errors);`
1773	`CLog::log(CLog::Log_Install, 2, "Shuffling Text Files");`	1773	`CLog::log(CLog::Log_Install, 2, L"Shuffling Text Files");`
1774	`shuffleTextFiles(errors);`	1774	`shuffleTextFiles(errors);`
1775	`}`	1775	`}`
1776		1776
1777	`// now we need to link any child/parent packages`	1777	`// now we need to link any child/parent packages`
1778	`if ( package->GetType() == TYPE_SPK )`	1778	`if ( package->GetType() == TYPE_SPK )`
Line 1785...	Line 1785...
1785	`}`	1785	`}`
1786		1786
1787	`// store enabled mod`	1787	`// store enabled mod`
1788	`if ( package->IsMod() && !disabled ) {`	1788	`if ( package->IsMod() && !disabled ) {`
1789	`m_pEnabledMod = package;`	1789	`m_pEnabledMod = package;`
1790	`CLog::log(CLog::Log_Install, 1, "Setting package as primary mod");`	1790	`CLog::log(CLog::Log_Install, 1, L"Setting package as primary mod");`
1791	`}`	1791	`}`
1792		1792
1793	`package->updateTextDB();`	1793	`package->updateTextDB();`
1794		1794
1795	`m_bRemoveDir = true;`	1795	`m_bRemoveDir = true;`
1796		1796
1797	`CLog::log(CLog::Log_Install, 1, "Saving data to file");`	1797	`CLog::log(CLog::Log_Install, 1, L"Saving data to file");`
1798	`this->WriteData();`	1798	`this->WriteData();`
1799		1799
1800	`CLog::log(CLog::Log_Install, 1, "Installation Finished");`	1800	`CLog::log(CLog::Log_Install, 1, L"Installation Finished");`
1801	`return true;`	1801	`return true;`
1802	`}`	1802	`}`
1803		1803
1804	`bool CPackages::uninstallPreparedPackages(Utils::WStringList errors, CProgressInfo progress, CLinkList<CBaseFile> uninstalledPackages, CLinkList<CBaseFile> disabledPackages)`	1804	`bool CPackages::uninstallPreparedPackages(Utils::WStringList errors, CProgressInfo progress, CLinkList<CBaseFile> uninstalledPackages, CLinkList<CBaseFile> disabledPackages)`
1805	`{`	1805	`{`
Line 2327...	Line 2327...
2327	`CXspFile p = (CXspFile )pNode->Data();`	2327	`CXspFile p = (CXspFile )pNode->Data();`
2328		2328
2329	`bool found = false;`	2329	`bool found = false;`
2330	`for ( CListNode<SGameShip> *wNode = m_lGameShips.Front(); wNode; wNode = wNode->next() )`	2330	`for ( CListNode<SGameShip> *wNode = m_lGameShips.Front(); wNode; wNode = wNode->next() )`
2331	`{`	2331	`{`
2332	`if ( wNode->Data()->sShipID.Compare(p->GetShipID().c_str()) )`	2332	`if ( wNode->Data()->sShipID.Compare(p->GetShipID()) )`
2333	`{`	2333	`{`
2334	`if ( !p->IsEnabled() )`	2334	`if ( !p->IsEnabled() )`
2335	`wNode->Data()->iType = WARETYPE_DISABLED;`	2335	`wNode->Data()->iType = WARETYPE_DISABLED;`
2336	`else`	2336	`else`
2337	`wNode->Data()->iType = WARETYPE_ADDED;`	2337	`wNode->Data()->iType = WARETYPE_ADDED;`
Line 2350...	Line 2350...
2350	`for ( CListNode<SGameShip> *wNode = m_lGameShips.Front(); wNode; wNode = wNode->next() )`	2350	`for ( CListNode<SGameShip> *wNode = m_lGameShips.Front(); wNode; wNode = wNode->next() )`
2351	`{`	2351	`{`
2352	`if ( (!gw) && (wNode->Data()->iType == WARETYPE_NONE) )`	2352	`if ( (!gw) && (wNode->Data()->iType == WARETYPE_NONE) )`
2353	`gw = wNode->Data();`	2353	`gw = wNode->Data();`
2354	`// find an old entry for the ware and add it to the same place`	2354	`// find an old entry for the ware and add it to the same place`
2355	`if ( wNode->Data()->sShipID.Compare(p->GetShipID().c_str()) )`	2355	`if ( wNode->Data()->sShipID.Compare(p->GetShipID()) )`
2356	`{`	2356	`{`
2357	`gw = wNode->Data();`	2357	`gw = wNode->Data();`
2358	`break;`	2358	`break;`
2359	`}`	2359	`}`
2360	`}`	2360	`}`
Line 2477...	Line 2477...
2477	`{`	2477	`{`
2478	`// base mode for Reunion`	2478	`// base mode for Reunion`
2479	`if ( m_iGame == GAME_X3 && m_pEnabledMod )`	2479	`if ( m_iGame == GAME_X3 && m_pEnabledMod )`
2480	`{`	2480	`{`
2481	`C_File *fDat = m_pEnabledMod->GetFirstFile(FILETYPE_MOD);`	2481	`C_File *fDat = m_pEnabledMod->GetFirstFile(FILETYPE_MOD);`
2482	`while (fDat && !fDat->IsFakePatch() && !fDat->checkFileExt("dat"))`	2482	`while (fDat && !fDat->IsFakePatch() && !fDat->checkFileExt(L"dat"))`
2483	`fDat = m_pEnabledMod->GetNextFile(fDat);`	2483	`fDat = m_pEnabledMod->GetNextFile(fDat);`
2484		2484
2485	`if ( fDat )`	2485	`if ( fDat )`
2486	`{`	2486	`{`
2487	`C_File *fCat = m_pEnabledMod->GetFirstFile(FILETYPE_MOD);`	2487	`C_File *fCat = m_pEnabledMod->GetFirstFile(FILETYPE_MOD);`
Line 2564...	Line 2564...
2564		2564
2565	`}`	2565	`}`
2566		2566
2567	`bool CPackages::RestoreFakePatch()`	2567	`bool CPackages::RestoreFakePatch()`
2568	`{`	2568	`{`
2569	`CLog::log(CLog::Log_Directory, 1, "Restoring PluginManager fake patch into game");`	2569	`CLog::log(CLog::Log_Directory, 1, L"Restoring PluginManager fake patch into game");`
2570	`m_iFakePatch = -1;`	2570	`m_iFakePatch = -1;`
2571		2571
2572	`CFileIO catFile(m_sCurrentDir + "/PluginManager/PlugMan_Fake.cat");`	2572	`CFileIO catFile(m_sCurrentDir + L"/PluginManager/PlugMan_Fake.cat");`
2573	`CFileIO datFile(m_sCurrentDir + "/PluginManager/PlugMan_Fake.dat");`	2573	`CFileIO datFile(m_sCurrentDir + L"/PluginManager/PlugMan_Fake.dat");`
2574		2574
2575	`// if only 1 exists, remove it`	2575	`// if only 1 exists, remove it`
2576	`if ( catFile.exists() && !datFile.exists() ) {`	2576	`if ( catFile.exists() && !datFile.exists() ) {`
2577	`CLog::log(CLog::Log_Directory, 1, "WARNING: cat/dat file mismatch, dat file seems to be missing, removing cat file");`	2577	`CLog::log(CLog::Log_Directory, 1, L"WARNING: cat/dat file mismatch, dat file seems to be missing, removing cat file");`
2578	`if ( !catFile.remove() ) return false;`	2578	`if ( !catFile.remove() ) return false;`
2579	`}`	2579	`}`
2580	`else if ( !catFile.exists() && datFile.exists() ) {`	2580	`else if ( !catFile.exists() && datFile.exists() ) {`
2581	`CLog::log(CLog::Log_Directory, 1, "WARNING: cat/dat file mismatch, cat file seems to be missing, removing dat file");`	2581	`CLog::log(CLog::Log_Directory, 1, L"WARNING: cat/dat file mismatch, cat file seems to be missing, removing dat file");`
2582	`if ( !datFile.remove() ) return false;`	2582	`if ( !datFile.remove() ) return false;`
2583	`}`	2583	`}`
2584		2584
2585	`// if both exists, lets rename them`	2585	`// if both exists, lets rename them`
2586	`if ( catFile.exists() && datFile.exists() )`	2586	`if ( catFile.exists() && datFile.exists() )`
2587	`{`	2587	`{`
2588	`CLog::log(CLog::Log_Directory, 3, "Creating pluginmanagerfake.txt file to add to Fake Patch");`	2588	`CLog::log(CLog::Log_Directory, 3, L"Creating pluginmanagerfake.txt file to add to Fake Patch");`
2589	`// we need to add the plugin manager file in`	2589	`// we need to add the plugin manager file in`
2590	`Utils::WString file = m_sTempDir;`	2590	`Utils::WString file = m_sTempDir;`
2591	`if ( !file.empty() )`	2591	`if ( !file.empty() )`
2592	`file += L"/";`	2592	`file += L"/";`
2593	`file += L"pluginmanagerfake.txt";`	2593	`file += L"pluginmanagerfake.txt";`
Line 2621...	Line 2621...
2621	`}`	2621	`}`
2622		2622
2623		2623
2624	`// find next available fake patch`	2624	`// find next available fake patch`
2625	`m_iFakePatch = this->findNextFakePatch();`	2625	`m_iFakePatch = this->findNextFakePatch();`
2626	`CLog::log(CLog::Log_Directory, 2, "Finding next available fake patch number: " + (long)m_iFakePatch);`	2626	`CLog::log(CLog::Log_Directory, 2, L"Finding next available fake patch number: " + (long)m_iFakePatch);`
2627		2627
2628	`Utils::WString filename = Utils::WString::PadNumber(m_iFakePatch, 2);`	2628	`Utils::WString filename = Utils::WString::PadNumber(m_iFakePatch, 2);`

Subversion Repositories spk

(root)/libspk/src/Packages.cpp – Rev 212 → 213