Subversion Repositories spk

Rev

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

Rev 134 Rev 158
Line 804... Line 804...
804 
 
 804 
 
805 
	// else find the custom start script
 805 
	// else find the custom start script
806 
	C_File *file = NULL;
 806 
	C_File *file = NULL;
807 
	for ( file = this->GetFirstFile(FILETYPE_SCRIPT); file; file = this->GetNextFile(file) )
 807 
	for ( file = this->GetFirstFile(FILETYPE_SCRIPT); file; file = this->GetNextFile(file) )
808 
	{
 808 
	{
809 
		if ( file->GetFilename().IsIn("initplayership")	&& file->GetFilename().GetToken(".", 1, 1).Compare("galaxy") )
 809 
		if ( file->filename().contains("initplayership") && file->filename().token(".", 1).Compare("galaxy") )
810 
			break;
 810 
			break;
811 
	}
 811 
	}
812 
 
 812 
 
813 
	if ( !file )
 813 
	if ( !file )
814 
		return "";
 814 
		return "";
815 
 
 815 
 
816 
	return file->GetFilename().GetToken(".", 2, 2).ToString();
 816 
	return file->filename().token(".", 2);
817 
}
 817 
}
818 
 
 818 
 
819 
void CSpkFile::MergePackage(CBaseFile *base)
 819 
void CSpkFile::MergePackage(CBaseFile *base)
820 
{
 820 
{
821 
	// update possible changes
 821 
	// update possible changes
Line 873... Line 873...
873 
	{
 873 
	{
874 
		C_File *f = node->Data();
 874 
		C_File *f = node->Data();
875 
		// if it exists, remove the old
 875 
		// if it exists, remove the old
876 
		for ( CListNode<C_File> *thisNode = m_lFiles.Front(); thisNode; thisNode = thisNode->next() )
 876 
		for ( CListNode<C_File> *thisNode = m_lFiles.Front(); thisNode; thisNode = thisNode->next() )
877 
		{
 877 
		{
878 
			if ( thisNode->Data()->GetFileType() == f->GetFileType() && thisNode->Data()->GetFilename().Compare(f->GetFilename()) && thisNode->Data()->GetDir().Compare(f->GetDir()) )
 878 
			if ( thisNode->Data()->GetFileType() == f->GetFileType() && thisNode->Data()->filename().Compare(f->filename()) && thisNode->Data()->dir().Compare(f->dir()) )
879 
			{
 879 
			{
880 
				m_lFiles.remove(thisNode);
 880 
				m_lFiles.remove(thisNode);
881 
				break;
 881 
				break;
882 
			}
 882 
			}
883 
		}
 883 
		}