mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-12 10:37:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[9166] Fixes/cleanups in extarctor code.

Browse source 
* Avoid create debug binary version with space in name, ignore it in git changes.
* Alow filenum == 0 in archive file lists. Some currently not loaded fiels have its
  for example in case when in archive single file.

NOTE: no change in extracted files, so not need re-execute.
This commit is contained in:
VladimirMangos 2010-01-13 05:15:44 +03:00
parent 23a77a1d36
commit 2d37ac049a
7 changed files with 30 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

36
contrib/extractor/System.cpp
View file

@ -878,11 +878,27 @@ void ExtractMapsFromMpq()
delete [] map_ids;
}
bool ExtractFile( int locale, char const* mpq_name, std::string const& filename )
{
FILE *output = fopen(filename.c_str(), "wb");
if(!output)
{
printf("Can't create the output file '%s'\n", filename.c_str());
return false;
}
MPQFile m(mpq_name);
if(!m.isEof())
fwrite(m.getPointer(), 1, m.getSize(), output);
fclose(output);
return true;
}
void ExtractDBCFiles(int locale, bool basicLocale)
{
printf("Extracting dbc files...\n");
set<string> dbcfiles;
std::set<std::string> dbcfiles;
// get DBC file list
for(ArchiveSet::iterator i = gOpenArchives.begin(); i != gOpenArchives.end();++i)
@ -894,7 +910,7 @@ void ExtractDBCFiles(int locale, bool basicLocale)
dbcfiles.insert(*iter);
}
string path = output_path;
std::string path = output_path;
path += "/dbc/";
CreateDir(path);
if(!basicLocale)
@ -911,18 +927,8 @@ void ExtractDBCFiles(int locale, bool basicLocale)
string filename = path;
filename += (iter->c_str() + strlen("DBFilesClient\\"));
FILE *output = fopen(filename.c_str(), "wb");
if(!output)
{
printf("Can't create the output file '%s'\n", filename.c_str());
continue;
}
MPQFile m(iter->c_str());
if(!m.isEof())
fwrite(m.getPointer(), 1, m.getSize(), output);
fclose(output);
++count;
if(ExtractFile(locale, iter->c_str(), filename))
++count;
}
printf("Extracted %u DBC files\n\n", count);
}
@ -993,8 +999,8 @@ int main(int argc, char * arg[])
//Extract DBC files
if(FirstLocale < 0)
{
ExtractDBCFiles(i, true);
FirstLocale = i;
ExtractDBCFiles(i, true);
}
else
ExtractDBCFiles(i, false);