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

Added: Temporary workaround for using sound sheet id without updated sheet id bin

Browse source 
--HG--
branch : sound_dev
This commit is contained in:
kaetemi 2012-06-03 15:57:57 +02:00
parent 6bc3ef2ba6
commit 497ae4d09b
1 changed files with 45 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
code/nel/src/misc/sheet_id.cpp
View file

@ -44,6 +44,12 @@ std::map<std::string, uint32> CSheetId::_DevTypeNameToId;
std::vector<std::vector<std::string> > CSheetId::_DevSheetIdToName; std::vector<std::vector<std::string> > CSheetId::_DevSheetIdToName;
std::map<std::string, uint32> CSheetId::_DevSheetNameToId; std::map<std::string, uint32> CSheetId::_DevSheetNameToId;
#define NL_TEMP_YUBO_NO_SOUND_SHEET_ID
#ifdef NL_TEMP_YUBO_NO_SOUND_SHEET_ID
namespace { bool a_NoSoundSheetId = false; }
#endif
const CSheetId CSheetId::Unknown(0); const CSheetId CSheetId::Unknown(0);
void CSheetId::cbFileChange (const std::string &filename) void CSheetId::cbFileChange (const std::string &filename)
@ -135,7 +141,7 @@ bool CSheetId::buildSheetId(const std::string& sheetName)
if (it == _DevSheetNameToId.end()) if (it == _DevSheetNameToId.end())
{ {
// Create a new dynamic sheet ID. // Create a new dynamic sheet ID.
nldebug("SHEETID: Creating a new dynamic sheet id for '%s'", sheetName.c_str()); nldebug("SHEETID: Creating a dynamic sheet id for '%s'", sheetName.c_str());
std::string sheetType = CFile::getExtension(sheetNameLc); std::string sheetType = CFile::getExtension(sheetNameLc);
std::string sheetName = CFile::getFilenameWithoutExtension(sheetNameLc); std::string sheetName = CFile::getFilenameWithoutExtension(sheetNameLc);
std::map<std::string, uint32>::iterator tit = _DevTypeNameToId.find(sheetType); std::map<std::string, uint32>::iterator tit = _DevTypeNameToId.find(sheetType);
@ -192,6 +198,27 @@ bool CSheetId::buildSheetId(const std::string& sheetName)
return true; return true;
} }
} }
#ifdef NL_TEMP_YUBO_NO_SOUND_SHEET_ID
if (a_NoSoundSheetId && sheetName.find(".sound") != std::string::npos)
{
std::string sheetNameLc = toLower(sheetName);
std::map<std::string, uint32>::iterator it = _DevSheetNameToId.find(sheetNameLc);
if (it == _DevSheetNameToId.end())
{
uint32 typeId = typeFromFileExtension("sound");
nldebug("SHEETID: Creating a temporary sheet id for '%s'", sheetName.c_str());
_DevSheetIdToName[0].push_back(sheetName);
_Id.IdInfos.Type = typeId;
_Id.IdInfos.Id = _DevSheetIdToName[0].size() - 1;
_DevSheetNameToId[sheetNameLc] = _Id.Id;
return true;
}
_Id.Id = it->second;
return true;
}
#endif
return false; return false;
} }
@ -345,6 +372,15 @@ void CSheetId::init(bool removeUnknownSheet)
loadSheetId (); loadSheetId ();
_Initialised=true; _Initialised=true;
#ifdef NL_TEMP_YUBO_NO_SOUND_SHEET_ID
if (typeFromFileExtension("sound") == std::numeric_limits<uint32>::max())
{
nlwarning("SHEETID: Loading without known sound sheet id, please update sheet_id.bin with .sound sheets");
_FileExtensions.push_back("sound");
_DevSheetIdToName.push_back(std::vector<std::string>());
a_NoSoundSheetId = true;
}
#endif
} // init // } // init //
@ -501,6 +537,12 @@ string CSheetId::toString(bool ifNotFoundUseNumericId) const
} }
else else
{ {
#ifdef NL_TEMP_YUBO_NO_SOUND_SHEET_ID
if (a_NoSoundSheetId && _FileExtensions[_Id.IdInfos.Type] == "sound")
{
return _DevSheetIdToName[0][_Id.IdInfos.Id];
}
#endif
// This nlwarning is commented out because the loggers are mutexed, therefore // This nlwarning is commented out because the loggers are mutexed, therefore
// you couldn't use toString() within a nlwarning(). // you couldn't use toString() within a nlwarning().
//nlwarning("<CSheetId::toString> The sheet %08x is not in sheet_id.bin",_Id.Id); //nlwarning("<CSheetId::toString> The sheet %08x is not in sheet_id.bin",_Id.Id);
@ -543,6 +585,8 @@ void CSheetId::serialString(NLMISC::IStream &f, const std::string &defaultType)
} }
else else
{ {
// if this assert fails, you may be using an outdated id bin
nlassert(*this != CSheetId::Unknown);
std::string sheetName = toString(); std::string sheetName = toString();
f.serial(sheetName); f.serial(sheetName);
} }