Subversion Repositories spk

Rev

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

Rev 6 Rev 10
Line 509... Line 509...
509 
			for ( CListNode<SWares> *wNode = p->GetWaresList()->Front(); wNode; wNode = wNode->next() )
 509 
			for ( CListNode<SWares> *wNode = p->GetWaresList()->Front(); wNode; wNode = wNode->next() )
510 
			{
 510 
			{
511 
				SWares *w = wNode->Data();
 511 
				SWares *w = wNode->Data();
512 
				for ( CListNode<SGameWare> *gNode = m_lGameWares[CPackages::ConvertWareType(w->cType)].Front(); gNode; gNode = gNode->next() )
 512 
				for ( CListNode<SGameWare> *gNode = m_lGameWares[CPackages::ConvertWareType(w->cType)].Front(); gNode; gNode = gNode->next() )
513 
				{
 513 
				{
514 
					if ( w->sID == gNode->Data()->sWareName )
 514 
					if ( w->sID == gNode->Data()->sWareName.ToString() )
515 
					{
 515 
					{
516 
						gNode->Data()->pWare = w;
 516 
						gNode->Data()->pWare = w;
517 
						break;
 517 
						break;
518 
					}
 518 
					}
519 
				}
 519 
				}
Line 2123... Line 2123...
2123 
				if ( spk->IsAnotherMod() )
 2123 
				if ( spk->IsAnotherMod() )
2124 
				{
 2124 
				{
2125 
					for ( CListNode<CBaseFile> *node = m_lInstallList.Front(); node; node = node->next() )
 2125 
					for ( CListNode<CBaseFile> *node = m_lInstallList.Front(); node; node = node->next() )
2126 
					{
 2126 
					{
2127 
						CBaseFile *p = node->Data();
 2127 
						CBaseFile *p = node->Data();
2128 
						if ( spk->GetOtherName().Compare(p->GetName()) && spk->GetOtherAuthor().Compare(p->GetAuthor()) )
 2128 
						if ( spk->GetOtherName().Compare(p->GetName().ToString()) && spk->GetOtherAuthor().Compare(p->GetAuthor().ToString()) )
2129 
						{
 2129 
						{
2130 
							m_lInstallList.insert(m_lInstallList.FindPos(p) + 2, package);
 2130 
							m_lInstallList.insert(m_lInstallList.FindPos(p) + 2, package);
2131 
							added = true;
 2131 
							added = true;
2132 
							break;
 2132 
							break;
2133 
						}
 2133 
						}
Line 2145... Line 2145...
2145 
 
 2145 
 
2146 
					CSpkFile *spk = (CSpkFile *)node->Data();
 2146 
					CSpkFile *spk = (CSpkFile *)node->Data();
2147 
					if ( !spk->IsAnotherMod() )
 2147 
					if ( !spk->IsAnotherMod() )
2148 
						continue;
 2148 
						continue;
2149 
 
 2149 
 
2150 
					if ( spk->GetOtherName().Compare(package->GetName()) && spk->GetOtherAuthor().Compare(package->GetAuthor()) )
 2150 
					if ( spk->GetOtherName().Compare(package->GetName().ToString()) && spk->GetOtherAuthor().Compare(package->GetAuthor().ToString()) )
2151 
					{
 2151 
					{
2152 
						added = true;
 2152 
						added = true;
2153 
						m_lInstallList.insert(node->Data(), package);
 2153 
						m_lInstallList.insert(node->Data(), package);
2154 
						break;
 2154 
						break;
2155 
					}
 2155 
					}
Line 3532... Line 3532...
3532 
					return false;
 3532 
					return false;
3533 
 
 3533 
 
3534 
				bool found = false;
 3534 
				bool found = false;
3535 
				for ( CListNode<CBaseFile> *node = m_lInstallList.Front(); node; node = node->next() )
 3535 
				for ( CListNode<CBaseFile> *node = m_lInstallList.Front(); node; node = node->next() )
3536 
				{
 3536 
				{
3537 
					if ( spk->GetOtherName().Compare(node->Data()->GetName()) && spk->GetOtherAuthor().Compare(node->Data()->GetAuthor()) )
 3537 
					if ( spk->GetOtherName().Compare(node->Data()->GetName().ToString()) && spk->GetOtherAuthor().Compare(node->Data()->GetAuthor().ToString()) )
3538 
					{
 3538 
					{
3539 
						found = true;
 3539 
						found = true;
3540 
						break;
 3540 
						break;
3541 
					}
 3541 
					}
3542 
				}
 3542 
				}
Line 3669... Line 3669...
3669 
			}
 3669 
			}
3670 
 
 3670 
 
3671 
			if ( !found )
 3671 
			if ( !found )
3672 
			{
 3672 
			{
3673 
				if ( list )
 3673 
				if ( list )
3674 
					list->PushBack(spk->GetOtherName(), spk->GetOtherAuthor());
 3674 
					list->PushBack(CyString(spk->GetOtherName()), CyString(spk->GetOtherAuthor()));
3675 
				++count;
 3675 
				++count;
3676 
			}
 3676 
			}
3677 
		}
 3677 
		}
3678 
	}
 3678 
	}
3679 
 
 3679