Revert sound sheet id workaround

feature/opengl3
kaetemi 5 years ago
parent f81f348d64
commit 943a3c239a

@ -147,10 +147,8 @@ 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;
bool fileTypeGet = getFileType((*itIF).second, fileType);
if((*itIF).second.empty() || (*itIF).second=="." || (*itIF).second==".." || ((*itIF).second[0]=='_' && fileType != "sound") || (*itIF).second.find(".#")==0) if ((*itIF).second.empty() || (*itIF).second=="." || (*itIF).second==".." || (*itIF).second[0]=='_' || (*itIF).second.find(".#")==0)
{ {
map<TFormId,string>::iterator itErase = itIF; map<TFormId,string>::iterator itErase = itIF;
++itIF; ++itIF;
@ -158,7 +156,8 @@ void readFormId( string& outputFileName )
} }
else else
{ {
if(fileTypeGet) string fileType;
if (getFileType((*itIF).second, fileType))
{ {
// 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);
@ -294,8 +293,7 @@ void makeId( list<string>& dirs )
//----------------------------------------------- //-----------------------------------------------
void addId( string fileName ) void addId( string fileName )
{ {
string extStr = CFile::getExtension( fileName ); if (fileName.empty() || fileName == "." || fileName == ".." || fileName[0] == '_' || fileName.find(".#") == 0)
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++;
@ -305,6 +303,7 @@ 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++;

Loading…
Cancel
Save