Subversion Repositories spk

Rev

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

Rev 127 Rev 134
Line 591... Line 591...
591 
	}
 591 
	}
592 
 
 592 
 
593 
	return "Other";
 593 
	return "Other";
594 
}
 594 
}
595 
 
 595 
 
596 
bool CSpkFile::LoadPackageData(const Utils::String &sFirst, const Utils::String &sRest, const Utils::String &sMainGame, Utils::CStringList &otherGames, Utils::CStringList &gameAddons)
 596 
bool CSpkFile::LoadPackageData(const Utils::String &sFirst, const Utils::String &sRest, const Utils::String &sMainGame, Utils::CStringList &otherGames, Utils::CStringList &gameAddons, CProgressInfo *progress)
597 
{
 597 
{
598 
	if ( sFirst.Compare("ScriptType") )
 598 
	if ( sFirst.Compare("ScriptType") )
599 
	{
 599 
	{
600 
		if ( sRest.Compare("Library") || sRest.Compare("Library Script") )
 600 
		if ( sRest.Compare("Library") || sRest.Compare("Library Script") )
601 
			this->SetLibrary();
 601 
			this->SetLibrary();
Line 682... Line 682...
682 
		}
 682 
		}
683 
		m_lWares.push_back ( ware );
 683 
		m_lWares.push_back ( ware );
684 
		m_pLastWare = ware;
 684 
		m_pLastWare = ware;
685 
	}
 685 
	}
686 
 
 686 
 
687 
	else if ( CBaseFile::LoadPackageData(sFirst, sRest, sMainGame, otherGames, gameAddons) )
 687 
	else if ( CBaseFile::LoadPackageData(sFirst, sRest, sMainGame, otherGames, gameAddons, progress) )
688 
		return true;
 688 
		return true;
689 
	else
 689 
	else
690 
		return false;
 690 
		return false;
691 
 
 691 
 
692 
	return true;
 692 
	return true;
Line 1177... Line 1177...
1177 
	if ( !dir.empty() )
 1177 
	if ( !dir.empty() )
1178 
		file->SetDir ( dir );
 1178 
		file->SetDir ( dir );
1179
1179
1180 
	this->AddFile ( file );
 1180 
	this->AddFile ( file );
1181 
 
 1181 
 
1182 
	CLog::logf(CLog::Log_File, 3, "Size: %s", file->GetDataSizeString().c_str() );
 1182 
	CLog::logf(CLog::Log_File, 3, "Size: %s", file->dataSizeString().c_str() );
1183 
 
 1183 
 
1184 
	return d;
 1184 
	return d;
1185 
}
 1185 
}
1186 
 
 1186 
 
1187 
CSpkFile *CSpkFile::convertFromOld(const Utils::String &sOldFilename)
 1187 
CSpkFile *CSpkFile::convertFromOld(const Utils::String &sOldFilename)
Line 1283... Line 1283...
1283 
 
 1283 
 
1284 
			d += size;
 1284 
			d += size;
1285 
 
 1285 
 
1286 
			this->SetIcon(file, ext);
 1286 
			this->SetIcon(file, ext);
1287 
 
 1287 
 
1288 
			CLog::logf(CLog::Log_File, 3, "\tIcon (%s) Size: %s", ext.c_str(), file->GetDataSizeString ().c_str() );
 1288 
			CLog::logf(CLog::Log_File, 3, "\tIcon (%s) Size: %s", ext.c_str(), file->dataSizeString ().c_str() );
1289 
		}
 1289 
		}
1290 
		else if ( sCmd.left(3) == "$$$" )
 1290 
		else if ( sCmd.left(3) == "$$$" )
1291 
			d = _convert_parseFile(sCmd, sRest, fVersion, d);
 1291 
			d = _convert_parseFile(sCmd, sRest, fVersion, d);
1292 
		else {
 1292 
		else {
1293 
			this->_convert_parse(sCmd, sRest);
 1293 
			this->_convert_parse(sCmd, sRest);