Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Added: Hack to exclude .sound sheets starting with _ from being filtered out from the sheet_id.bin. Sound sheets do not follow the conventional sheets naming pattern at the moment

Browse source
This commit is contained in:
kaetemi 2012-05-23 22:05:34 +02:00
parent d27c9cfc69
commit fade75eba6
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
code/nel/tools/misc/make_sheet_id/make_sheet_id.cpp
View file

@ -147,8 +147,9 @@ void readFormId( string& outputFileName )
// get the file type from form name // get the file type from form name
TFormId fid = (*itIF).first; TFormId fid = (*itIF).first;
string fileType; string fileType;
bool fileTypeGet = getFileType((*itIF).second, fileType);
if((*itIF).second.empty() || (*itIF).second=="." || (*itIF).second==".." || (*itIF).second[0]=='_' || (*itIF).second.find(".#")==0) if((*itIF).second.empty() || (*itIF).second=="." || (*itIF).second==".." || ((*itIF).second[0]=='_' && fileType != "sound") || (*itIF).second.find(".#")==0)
{ {
map<TFormId,string>::iterator itErase = itIF; map<TFormId,string>::iterator itErase = itIF;
++itIF; ++itIF;
@ -156,7 +157,7 @@ void readFormId( string& outputFileName )
} }
else else
{ {
if( getFileType( (*itIF).second, fileType ) ) if(fileTypeGet)
{ {
// insert the association (file type/file type id) // insert the association (file type/file type id)
map<string,uint8>::iterator itFT = FileTypeToId.find(fileType); map<string,uint8>::iterator itFT = FileTypeToId.find(fileType);
@ -290,7 +291,8 @@ void makeId( list<string>& dirs )
//----------------------------------------------- //-----------------------------------------------
void addId( string fileName ) void addId( string fileName )
{ {
if(fileName.empty() || fileName=="." || fileName==".." || fileName[0]=='_' || fileName.find(".#")==0) string extStr = CFile::getExtension( fileName );
if(fileName.empty() || fileName=="." || fileName==".." || (fileName[0]=='_' && extStr != "sound") || fileName.find(".#")==0)
{ {
//nlinfo("Discarding file '%s'", fileName.c_str()); //nlinfo("Discarding file '%s'", fileName.c_str());
NbFilesDiscarded++; NbFilesDiscarded++;
@ -300,7 +302,6 @@ void addId( string fileName )
{ {
if( !ExtensionsAllowed.empty() ) if( !ExtensionsAllowed.empty() )
{ {
string extStr = CFile::getExtension( fileName );
if( ExtensionsAllowed.find(extStr) == ExtensionsAllowed.end() ) if( ExtensionsAllowed.find(extStr) == ExtensionsAllowed.end() )
{ {
NbFilesDiscarded++; NbFilesDiscarded++;