aleajactaest/khanat-code-old
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/khanat-code-old.git synced 2024-11-05 23:09:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Changed: Assign sane type id to temporary sound sheet ids

Browse source
This commit is contained in:
kaetemi 2012-06-04 13:27:12 +02:00
parent c54acdb6d2
commit cb1d9a9f73
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -206,7 +206,7 @@ bool CSheetId::buildSheetId(const std::string& sheetName)
std::map<std::string, uint32>::iterator it = _DevSheetNameToId.find(sheetNameLc); std::map<std::string, uint32>::iterator it = _DevSheetNameToId.find(sheetNameLc);
if (it == _DevSheetNameToId.end()) if (it == _DevSheetNameToId.end())
{ {
uint32 typeId = typeFromFileExtension("sound"); uint32 typeId = ((1 << (NL_SHEET_ID_TYPE_BITS)) - 1);
// nldebug("SHEETID: Creating a temporary sheet id for '%s'", sheetName.c_str()); // nldebug("SHEETID: Creating a temporary sheet id for '%s'", sheetName.c_str());
_DevSheetIdToName[0].push_back(sheetName); _DevSheetIdToName[0].push_back(sheetName);
_Id.IdInfos.Type = typeId; _Id.IdInfos.Type = typeId;
@ -376,7 +376,8 @@ void CSheetId::init(bool removeUnknownSheet)
if (typeFromFileExtension("sound") == std::numeric_limits<uint32>::max()) if (typeFromFileExtension("sound") == std::numeric_limits<uint32>::max())
{ {
nlwarning("SHEETID: Loading without known sound sheet id, please update sheet_id.bin with .sound sheets"); nlwarning("SHEETID: Loading without known sound sheet id, please update sheet_id.bin with .sound sheets");
_FileExtensions.push_back("sound"); nlassert(_FileExtensions.size() == 1 << (NL_SHEET_ID_TYPE_BITS));
_FileExtensions[((1 << (NL_SHEET_ID_TYPE_BITS)) - 1)] == "sound";
_DevSheetIdToName.push_back(std::vector<std::string>()); _DevSheetIdToName.push_back(std::vector<std::string>());
a_NoSoundSheetId = true; a_NoSoundSheetId = true;
} }
@ -512,7 +513,7 @@ string CSheetId::toString(bool ifNotFoundUseNumericId) const
else else
{ {
#ifdef NL_TEMP_YUBO_NO_SOUND_SHEET_ID #ifdef NL_TEMP_YUBO_NO_SOUND_SHEET_ID
if (a_NoSoundSheetId && _FileExtensions[_Id.IdInfos.Type] == "sound") if (a_NoSoundSheetId && _Id.IdInfos.Type == ((1 << (NL_SHEET_ID_TYPE_BITS)) - 1))
{ {
return _DevSheetIdToName[0][_Id.IdInfos.Id]; return _DevSheetIdToName[0][_Id.IdInfos.Id];
} }