Subversion Repositories spk

Rev

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

Rev 94 Rev 98
Line 753... Line 753...
753 
 
 753 
 
754 
bool CXspFile::GeneratePackagerScript(bool wildcard, CyStringList *list, bool datafile)
 754 
bool CXspFile::GeneratePackagerScript(bool wildcard, CyStringList *list, bool datafile)
755 
{
 755 
{
756 
	if ( !CBaseFile::GeneratePackagerScript(wildcard, list, datafile) )
 756 
	if ( !CBaseFile::GeneratePackagerScript(wildcard, list, datafile) )
757 
		return false;
 757 
		return false;
- 
 
 758 
 
- 
 
 759 
	list->PushBack("# File Type, Script or Ship");
- 
 
 760 
	list->PushBack("FileType: Ship");
- 
 
 761 
	list->PushBack("");
758 
 
 762 
 
759 
	if ( m_iShipyard )
 763 
	if ( m_iShipyard )
760 
	{
 764 
	{
761 
		list->PushBack("# Shipyards, Set which shipyards to add ships for sale to");
 765 
		list->PushBack("# Shipyards, Set which shipyards to add ships for sale to");
762 
		for ( int i = SHIPYARD_ARGON; i <= SHIPYARD_MAX; i *= 2 )
 766 
		for ( int i = SHIPYARD_ARGON; i <= SHIPYARD_MAX; i *= 2 )
Line 801... Line 805...
801 
	}
 805 
	}
802 
 
 806 
 
803 
	return true;
 807 
	return true;
804 
}
 808 
}
805 
 
 809 
 
806 
bool CXspFile::LoadPackageData(const Utils::String &sFirst, const Utils::String &sRest)
 810 
bool CXspFile::LoadPackageData(const Utils::String &sFirst, const Utils::String &sRest, const Utils::String &sMainGame, Utils::CStringList &otherGames)
807 
{
 811 
{
808 
	if ( sFirst.Compare("Shipyard") )
 812 
	if ( sFirst.Compare("Shipyard") )
809 
	{
 813 
	{
810 
		for ( int i = SHIPYARD_ARGON; i <= SHIPYARD_MAX; i *= 2 )
 814 
		for ( int i = SHIPYARD_ARGON; i <= SHIPYARD_MAX; i *= 2 )
811 
		{
 815 
		{
Line 827... Line 831...
827 
	}
 831 
	}
828 
	else if ( sFirst.Compare("ExistingShip") )
 832 
	else if ( sFirst.Compare("ExistingShip") )
829 
		m_bExistingShip = true;
 833 
		m_bExistingShip = true;
830 
	else if ( sFirst.Compare("ShipID") )
 834 
	else if ( sFirst.Compare("ShipID") )
831 
		m_sID = sRest;
 835 
		m_sID = sRest;
832 
	else if ( !CBaseFile::LoadPackageData(sFirst, sRest) )
 836 
	else if ( !CBaseFile::LoadPackageData(sFirst, sRest, sMainGame, otherGames) )
833 
	{
 837 
	{
834 
		return false;
 838 
		return false;
835 
	}
 839 
	}
836 
 
 840 
 
837 
	return true;
 841 
	return true;