Subversion Repositories spk

Rev

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

Rev 129 Rev 134
Line 1039... Line 1039...
1039 
			ZipAdd(hz, buf, data, dataSize);
 1039 
			ZipAdd(hz, buf, data, dataSize);
1040 
		}
 1040 
		}
1041 
	}
 1041 
	}
1042 
}
 1042 
}
1043 
 
 1043 
 
1044 
bool CXspFile::LoadPackageData(const Utils::String &sFirst, const Utils::String &sRest, const Utils::String &sMainGame, Utils::CStringList &otherGames, Utils::CStringList &gameAddons)
 1044 
bool CXspFile::LoadPackageData(const Utils::String &sFirst, const Utils::String &sRest, const Utils::String &sMainGame, Utils::CStringList &otherGames, Utils::CStringList &gameAddons, CProgressInfo *progress)
1045 
{
 1045 
{
1046 
	if ( sFirst.Compare("Shipyard") )
 1046 
	if ( sFirst.Compare("Shipyard") )
1047 
	{
 1047 
	{
1048 
		for ( int i = SHIPYARD_ARGON; i <= SHIPYARD_MAX; i *= 2 )
 1048 
		for ( int i = SHIPYARD_ARGON; i <= SHIPYARD_MAX; i *= 2 )
1049 
		{
 1049 
		{
Line 1085... Line 1085...
1085 
		this->AddCutData(sRest);
 1085 
		this->AddCutData(sRest);
1086 
	else if ( sFirst.Compare("Animation") )
 1086 
	else if ( sFirst.Compare("Animation") )
1087 
		this->AddAnimation(sRest);
 1087 
		this->AddAnimation(sRest);
1088 
	else if ( sFirst.Compare("Bodies") )
 1088 
	else if ( sFirst.Compare("Bodies") )
1089 
		this->AddBodies(sRest);
 1089 
		this->AddBodies(sRest);
1090 
	else if ( !CBaseFile::LoadPackageData(sFirst, sRest, sMainGame, otherGames, gameAddons) )
 1090 
	else if ( !CBaseFile::LoadPackageData(sFirst, sRest, sMainGame, otherGames, gameAddons, progress) )
1091 
	{
 1091 
	{
1092 
		return false;
 1092 
		return false;
1093 
	}
 1093 
	}
1094 
 
 1094 
 
1095 
	return true;
 1095 
	return true;