aleajactaest/khanat-opennel-code
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/khanat-opennel-code.git synced 2024-11-10 09:19:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Changed: Small optimization for sheet id constructor with default type

Browse source
This commit is contained in:
kaetemi 2012-06-05 14:03:38 +02:00
parent c618a29276
commit 6a806d82d2
1 changed files with 6 additions and 1 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

@ -114,15 +114,20 @@ CSheetId::CSheetId( const string& sheetName )
CSheetId::CSheetId( const std::string& sheetName, const std::string &defaultType ) CSheetId::CSheetId( const std::string& sheetName, const std::string &defaultType )
{ {
if (CFile::getExtension(sheetName) == "" && defaultType != "") // Don't use this function without defaultType, use the one above.
nlassert(defaultType.size() != 0);
if (sheetName.rfind('.') == std::string::npos)
{ {
std::string withType = sheetName + "." + defaultType; std::string withType = sheetName + "." + defaultType;
*this = CSheetId(withType); *this = CSheetId(withType);
// nldebug("SHEETID: Constructing CSheetId from name '%s' without explicit type, defaulting as '%s' to '%s'", sheetName.c_str(), defaultType.c_str(), withType.c_str()); // nldebug("SHEETID: Constructing CSheetId from name '%s' without explicit type, defaulting as '%s' to '%s'", sheetName.c_str(), defaultType.c_str(), withType.c_str());
} }
else else
{
*this = CSheetId(sheetName); *this = CSheetId(sheetName);
} }
}
//----------------------------------------------- //-----------------------------------------------