Subversion Repositories spk

Rev

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

Rev 277 Rev 278
Line 9617... Line 9617...
9617
				if (g != -1)
9617
				if (g != -1)
9618
					game = g + 1;
9618
					game = g + 1;
9619
			}
9619
			}
9620
 
9620
 
9621
			if ( type == -1 )
9621
			if ( type == -1 )
9622
				f = archive->addFile(filename, dir, FILETYPE_EXTRA, game);
9622
				f = archive->addFile(filename, dir, FILETYPE_EXTRA, 1 << game);
9623
			else
9623
			else
9624
				f = archive->addFile(filename, extradir, static_cast<FileType>(type), game);
9624
				f = archive->addFile(filename, extradir, static_cast<FileType>(type), 1 << game);
9625
 
9625
 
9626
			if ( f )
9626
			if ( f )
9627
				f->SetData((const unsigned char *)iBuf, ze.unc_size);
9627
				f->SetData((const unsigned char *)iBuf, ze.unc_size);
9628
			else
9628
			else
9629
				delete[] iBuf;
9629
				delete[] iBuf;
Line 9651... Line 9651...
9651
	else
9651
	else
9652
		archive = this->_archive_fromZip(filename, false);
9652
		archive = this->_archive_fromZip(filename, false);
9653
 
9653
 
9654
	if ( archive ) {
9654
	if ( archive ) {
9655
		archive->setFilename(CFileIO(filename).changeFileExtension(L"spk"));
9655
		archive->setFilename(CFileIO(filename).changeFileExtension(L"spk"));
-
 
9656
		if (archive->name().empty())
-
 
9657
		{
9656
		if ( toInstall )
9658
			if (toInstall)
9657
			archive->setName(CFileIO(filename).filename());
9659
				archive->setName(CFileIO(filename).filename());
9658
		else
9660
			else
9659
			archive->setName(CFileIO(filename).baseName());
9661
				archive->setName(CFileIO(filename).baseName());
-
 
9662
		}
9660
	}
9663
	}
9661
 
9664
 
9662
	return archive;
9665
	return archive;
9663
}
9666
}
9664
 
9667