Subversion Repositories spk

Rev

Rev 336 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 336 Rev 344
Line 4749... Line 4749...
4749 
			continue; // huh ? we shouldn't have this
 4749 
			continue; // huh ? we shouldn't have this
4750 
 
 4750 
 
4751 
		// lets search for a matching id
 4751 
		// lets search for a matching id
4752 
		int useId = 0;
 4752 
		int useId = 0;
4753 
		bool found = false;
 4753 
		bool found = false;
4754 
		for ( int i = 0; i < data.size(); i++ )
 4754 
		for (size_t i = 0; i < data.size(); i++ )
4755 
		{
 4755 
		{
4756 
			if ( data[i] == L"NULL" )
 4756 
			if ( data[i] == L"NULL" )
4757 
				useId = -1;
 4757 
				useId = -1;
4758 
			else
 4758 
			else
4759 
			{
 4759 
			{
Line 8043... Line 8043...
8043 
	}
 8043 
	}
8044 
 
 8044 
 
8045 
 
 8045 
 
8046 
	if (package->filename().empty())
 8046 
	if (package->filename().empty())
8047 
	{
 8047 
	{
- 
 
 8048 
		if(progress)
8048 
		progress->UpdateDisplay(L"Updating package data...");
 8049 
			progress->UpdateDisplay(L"Updating package data...");
8049 
		package->loadPackageData(L"AutoSave", L"$AUTOSAVE", sMainGame, otherGames, gameAddons, progress);
 8050 
		package->loadPackageData(L"AutoSave", L"$AUTOSAVE", sMainGame, otherGames, gameAddons, progress);
8050 
	}
 8051 
	}
8051 
 
 8052 
 
8052 
	if (package->autoExtraction())
 8053 
	if (package->autoExtraction())
8053 
	{
 8054 
	{
- 
 
 8055 
		if(progress)
8054 
		progress->UpdateDisplay(L"Extracting data...");
 8056 
			progress->UpdateDisplay(L"Extracting data...");
8055 
		for (auto itr = package->autoExtraction()->begin(); itr != package->autoExtraction()->end(); itr++)
 8057 
		for (auto itr = package->autoExtraction()->begin(); itr != package->autoExtraction()->end(); itr++)
8056 
		{
 8058 
		{
8057 
			unsigned int game = itr->first;
 8059 
			unsigned int game = itr->first;
8058 
			for (auto node = package->fileList().Front(); node; node = node->next())
 8060 
			for (auto node = package->fileList().Front(); node; node = node->next())
8059 
			{
 8061 
			{
Line 8065... Line 8067...
8065 
		}
 8067 
		}
8066 
	}
 8068 
	}
8067 
 
 8069 
 
8068 
	if (package->autoExporter())
 8070 
	if (package->autoExporter())
8069 
	{
 8071 
	{
- 
 
 8072 
		if(progress)
8070 
		progress->UpdateDisplay(L"Exporting to archive...");
 8073 
			progress->UpdateDisplay(L"Exporting to archive...");
8071 
		for (auto itr = package->autoExporter()->begin(); itr != package->autoExporter()->end(); itr++)
 8074 
		for (auto itr = package->autoExporter()->begin(); itr != package->autoExporter()->end(); itr++)
8072 
			package->saveToArchive(itr->second, itr->first, &m_gameExe);
 8075 
			package->saveToArchive(itr->second, itr->first, &m_gameExe);
8073 
	}
 8076 
	}
8074 
 
 8077 
 
8075 
	if ( !ftpaddr.empty() )
 8078 
	if ( !ftpaddr.empty() )