| Line 82... |
Line 82... |
| 82 |
}
|
82 |
}
|
| 83 |
|
83 |
|
| 84 |
m_lNames.clear(true);
|
84 |
m_lNames.clear(true);
|
| 85 |
}
|
85 |
}
|
| 86 |
|
86 |
|
| 87 |
CyString CBaseFile::GetLanguageName ( int lang ) const
|
87 |
CyString CBaseFile::GetLanguageName(int lang) const
|
| 88 |
{
|
88 |
{
|
| 89 |
for ( CListNode<SNames> *node = m_lNames.Front(); node; node = node->next() )
|
89 |
for (CListNode<SNames>* node = m_lNames.Front(); node; node = node->next())
|
| 90 |
{
|
90 |
{
|
| 91 |
SNames *n = node->Data();
|
91 |
SNames* n = node->Data();
|
| - |
|
92 |
if (n->iLanguage == lang)
|
| - |
|
93 |
return n->sName;
|
| - |
|
94 |
}
|
| - |
|
95 |
return this->name();
|
| - |
|
96 |
}
|
| - |
|
97 |
|
| - |
|
98 |
const Utils::String &CBaseFile::getLanguageName(int lang) const
|
| - |
|
99 |
{
|
| - |
|
100 |
for (CListNode<SNames>* node = m_lNames.Front(); node; node = node->next())
|
| - |
|
101 |
{
|
| - |
|
102 |
SNames* n = node->Data();
|
| 92 |
if ( n->iLanguage == lang )
|
103 |
if (n->iLanguage == lang)
|
| 93 |
return n->sName;
|
104 |
return n->sName;
|
| 94 |
}
|
105 |
}
|
| 95 |
return this->name();
|
106 |
return this->name();
|
| 96 |
}
|
107 |
}
|
| 97 |
|
108 |
|
| Line 725... |
Line 736... |
| 725 |
|
736 |
|
| 726 |
// compress the file
|
737 |
// compress the file
|
| 727 |
if ( !m_pIconFile->CompressData ( m_SHeader2.iDataCompression, progress ) )
|
738 |
if ( !m_pIconFile->CompressData ( m_SHeader2.iDataCompression, progress ) )
|
| 728 |
m_pIconFile->SetDataCompression(SPKCOMPRESS_NONE);
|
739 |
m_pIconFile->SetDataCompression(SPKCOMPRESS_NONE);
|
| 729 |
|
740 |
|
| 730 |
line += CyString("Icon:") + (m_pIconFile->GetDataSize() + (long)4) + ":" + m_pIconFile->GetUncompressedDataSize() + ":" + (long)m_pIconFile->GetCompressionType() + ":" + m_sIconExt + "\n";
|
741 |
line += CyString("Icon:") + (m_pIconFile->GetDataSize() + (long)4) + ":" + m_pIconFile->GetUncompressedDataSize() + ":" + (long)m_pIconFile->GetCompressionType() + ":" + _sIconExt + "\n";
|
| 731 |
if ( updateheader )
|
742 |
if ( updateheader )
|
| 732 |
{
|
743 |
{
|
| 733 |
++m_SHeader2.iNumFiles;
|
744 |
++m_SHeader2.iNumFiles;
|
| 734 |
m_SHeader2.lFullSize += (m_pIconFile->GetDataSize() + 4);
|
745 |
m_SHeader2.lFullSize += (m_pIconFile->GetDataSize() + 4);
|
| 735 |
}
|
746 |
}
|
| Line 770... |
Line 781... |
| 770 |
|
781 |
|
| 771 |
if ( file->IsShared() )
|
782 |
if ( file->IsShared() )
|
| 772 |
command = CyString("$") + command;
|
783 |
command = CyString("$") + command;
|
| 773 |
|
784 |
|
| 774 |
if ( file->GetDir().Empty() )
|
785 |
if ( file->GetDir().Empty() )
|
| 775 |
line += (command + ":" + (file->GetDataSize() + (long)4) + ":" + file->GetUncompressedDataSize() + ":" + (long)file->GetCompressionType() + ":" + (long)file->GetCreationTime() + ":" + ((file->IsCompressedToFile()) ? "1" : "0") + ":" + file->GetFilename() + ":NULL:" + (long)file->game() + "\n");
|
786 |
line += (command + ":" + (file->GetDataSize() + (long)4) + ":" + file->GetUncompressedDataSize() + ":" + (long)file->GetCompressionType() + ":" + (long)file->GetCreationTime() + ":" + ((file->IsCompressedToFile()) ? "1" : "0") + ":" + file->filename() + ":NULL:" + (long)file->game() + "\n");
|
| 776 |
else
|
787 |
else
|
| 777 |
line += (command + ":" + (file->GetDataSize() + (long)4) + ":" + file->GetUncompressedDataSize() + ":" + (long)file->GetCompressionType() + ":" + (long)file->GetCreationTime() + ":" + ((file->IsCompressedToFile()) ? "1" : "0") + ":" + file->GetFilename() + ":" + file->GetDir() + ":" + (long)file->game() + "\n");
|
788 |
line += (command + ":" + (file->GetDataSize() + (long)4) + ":" + file->GetUncompressedDataSize() + ":" + (long)file->GetCompressionType() + ":" + (long)file->GetCreationTime() + ":" + ((file->IsCompressedToFile()) ? "1" : "0") + ":" + file->filename() + ":" + file->GetDir() + ":" + (long)file->game() + "\n");
|
| 778 |
|
789 |
|
| 779 |
if ( updateheader )
|
790 |
if ( updateheader )
|
| 780 |
{
|
791 |
{
|
| 781 |
++m_SHeader2.iNumFiles;
|
792 |
++m_SHeader2.iNumFiles;
|
| 782 |
m_SHeader2.lFullSize += (file->GetDataSize() + 4);
|
793 |
m_SHeader2.lFullSize += (file->GetDataSize() + 4);
|
| Line 1558... |
Line 1569... |
| 1558 |
long usize = line.token(":", 3).toInt ();
|
1569 |
long usize = line.token(":", 3).toInt ();
|
| 1559 |
long compression = line.token(":", 4).toInt ();
|
1570 |
long compression = line.token(":", 4).toInt ();
|
| 1560 |
|
1571 |
|
| 1561 |
if ( command == "Icon" )
|
1572 |
if ( command == "Icon" )
|
| 1562 |
{
|
1573 |
{
|
| 1563 |
m_sIconExt = line.token (":", 5);
|
1574 |
_sIconExt = line.token (":", 5);
|
| 1564 |
m_pIconFile = new C_File ();
|
1575 |
m_pIconFile = new C_File ();
|
| 1565 |
m_pIconFile->SetDataSize ( size - 4 );
|
1576 |
m_pIconFile->SetDataSize ( size - 4 );
|
| 1566 |
m_pIconFile->SetDataCompression ( compression );
|
1577 |
m_pIconFile->SetDataCompression ( compression );
|
| 1567 |
m_pIconFile->SetUncompressedDataSize ( usize );
|
1578 |
m_pIconFile->SetUncompressedDataSize ( usize );
|
| 1568 |
|
1579 |
|