Subversion Repositories spk

Rev

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

Rev 285 Rev 300
Line 959... Line 959...
959 
	if ( package->GetType() == TYPE_SPK )
 959 
	if ( package->GetType() == TYPE_SPK )
960 
	{
 960 
	{
961 
		CSpkFile *spk = (CSpkFile *)package;
 961 
		CSpkFile *spk = (CSpkFile *)package;
962 
		if ( spk->GetScriptType() == CSpkFile::SCRIPTTYPE_CUSTOM )
 962 
		if ( spk->GetScriptType() == CSpkFile::SCRIPTTYPE_CUSTOM )
963 
		{
 963 
		{
964 
			Utils::WString type = spk->scriptTypeString(44);
 964 
			Utils::WString type = spk->scriptTypeString(m_iLanguage);
965 
			if ( type.Compare(L"Ship Upgrade") )
 965 
			if ( type.Compare(L"Ship Upgrade") )
966 
				spk->setScriptType(CSpkFile::SCRIPTTYPE_SHIPUPGRADE);
 966 
				spk->setScriptType(CSpkFile::SCRIPTTYPE_SHIPUPGRADE);
967 
			else if ( type.Compare(L"Trade Script") )
 967 
			else if ( type.Compare(L"Trade Script") )
968 
				spk->setScriptType(CSpkFile::SCRIPTTYPE_TRADE);
 968 
				spk->setScriptType(CSpkFile::SCRIPTTYPE_TRADE);
969 
			else if ( type.Compare(L"Fleet Management") )
 969 
			else if ( type.Compare(L"Fleet Management") )
Line 3677... Line 3677...
3677 
					return false;
 3677 
					return false;
3678 
 
 3678 
 
3679 
				bool found = false;
 3679 
				bool found = false;
3680 
				for ( CListNode<CBaseFile> *node = m_lInstallList.Front(); node; node = node->next() )
 3680 
				for ( CListNode<CBaseFile> *node = m_lInstallList.Front(); node; node = node->next() )
3681 
				{
 3681 
				{
3682 
					if ( spk->otherName().Compare(node->Data()->name()) && spk->otherAuthor().Compare(node->Data()->author()) )
 3682 
					if (node->Data() && spk->otherName().Compare(node->Data()->name()) && spk->otherAuthor().Compare(node->Data()->author()) )
3683 
					{
 3683 
					{
3684 
						found = true;
 3684 
						found = true;
3685 
						break;
 3685 
						break;
3686 
					}
 3686 
					}
3687 
				}
 3687 
				}
Line 3958... Line 3958...
3958 
				{
 3958 
				{
3959 
					found = false;
 3959 
					found = false;
3960 
					for ( CListNode<CBaseFile> *pNode = m_lInstallList.Front(); pNode; pNode = pNode->next() )
 3960 
					for ( CListNode<CBaseFile> *pNode = m_lInstallList.Front(); pNode; pNode = pNode->next() )
3961 
					{
 3961 
					{
3962 
						CBaseFile *checkP = pNode->Data();
 3962 
						CBaseFile *checkP = pNode->Data();
3963 
						if ( p->author().Compare(checkP->author()) && p->name().Compare(checkP->name()) )
 3963 
						if (checkP && p->author().Compare(checkP->author()) && p->name().Compare(checkP->name()) )
3964 
						{
 3964 
						{
3965 
							found = true;
 3965 
							found = true;
3966 
							break;
 3966 
							break;
3967 
						}
 3967 
						}
3968 
					}
 3968 
					}