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

Changed: Replaced comparisons with string("") by empty() check

Browse source
This commit is contained in:
kervala 2016-12-18 14:40:54 +01:00
parent 9f8a8d1603
commit e2f3e5ee89
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_game_sheet.cpp
View file

@ -688,7 +688,7 @@ void CStaticCreatures::readGeorges( const NLMISC::CSmartPtr<NLGEORGES::UForm> &f
for( i = 0; i < SLOT_EQUIPMENT::NB_SLOT_EQUIPMENT; ++i ) for( i = 0; i < SLOT_EQUIPMENT::NB_SLOT_EQUIPMENT; ++i )
{ {
root.getValueByName( sheetName, (string("Basics.Equipment.") + SLOT_EQUIPMENT::toString( (SLOT_EQUIPMENT::TSlotEquipment) i ) + string(".Item" )).c_str() ); root.getValueByName( sheetName, (string("Basics.Equipment.") + SLOT_EQUIPMENT::toString( (SLOT_EQUIPMENT::TSlotEquipment) i ) + string(".Item" )).c_str() );
if( sheetName != string("") && sheetName.find(".item") != std::string::npos ) if( !sheetName.empty() && sheetName.find(".item") != std::string::npos )
{ {
sheet = CSheetId( sheetName ); sheet = CSheetId( sheetName );
_Items[ i ].IdSheet = sheet.asInt(); _Items[ i ].IdSheet = sheet.asInt();
@ -1790,7 +1790,7 @@ void CStaticCharacters::readGeorges( const NLMISC::CSmartPtr<NLGEORGES::UForm> &
/* for( i = 0; i < NB_SHEATH; ++i ) /* for( i = 0; i < NB_SHEATH; ++i )
{ {
root.getValueByName( sheetName, "Basics.Equipment.Sheath" + toString( i ) + "LeftHand.Item" ); root.getValueByName( sheetName, "Basics.Equipment.Sheath" + toString( i ) + "LeftHand.Item" );
if( sheetName != string("") ) if( !sheetName.empty() )
{ {
sheet = CSheetId( sheetName ); sheet = CSheetId( sheetName );
Sheaths[ i ].Left.IdSheet = sheet.asInt(); Sheaths[ i ].Left.IdSheet = sheet.asInt();
@ -1803,7 +1803,7 @@ void CStaticCharacters::readGeorges( const NLMISC::CSmartPtr<NLGEORGES::UForm> &
} }
root.getValueByName( sheetName, "Basics.Equipment.Sheath" + toString( i ) + "RightHand.Item" ); root.getValueByName( sheetName, "Basics.Equipment.Sheath" + toString( i ) + "RightHand.Item" );
if( sheetName != string("") ) if( !sheetName.empty() )
{ {
sheet = CSheetId( sheetName ); sheet = CSheetId( sheetName );
Sheaths[ i ].Right.IdSheet = sheet.asInt(); Sheaths[ i ].Right.IdSheet = sheet.asInt();
@ -1816,7 +1816,7 @@ void CStaticCharacters::readGeorges( const NLMISC::CSmartPtr<NLGEORGES::UForm> &
} }
root.getValueByName( sheetName, "Basics.Equipment.Sheath" + toString( i ) + "Ammo0.Item" ); root.getValueByName( sheetName, "Basics.Equipment.Sheath" + toString( i ) + "Ammo0.Item" );
if( sheetName != string("") ) if( !sheetName.empty() )
{ {
sheet = CSheetId( sheetName ); sheet = CSheetId( sheetName );
Sheaths[ i ].Ammo0.IdSheet = sheet.asInt(); Sheaths[ i ].Ammo0.IdSheet = sheet.asInt();
@ -1829,7 +1829,7 @@ void CStaticCharacters::readGeorges( const NLMISC::CSmartPtr<NLGEORGES::UForm> &
} }
root.getValueByName( sheetName, "Basics.Equipment.Sheath" + toString( i ) + "Ammo1.Item" ); root.getValueByName( sheetName, "Basics.Equipment.Sheath" + toString( i ) + "Ammo1.Item" );
if( sheetName != string("") ) if( !sheetName.empty() )
{ {
sheet = CSheetId( sheetName ); sheet = CSheetId( sheetName );
Sheaths[ i ].Ammo1.IdSheet = sheet.asInt(); Sheaths[ i ].Ammo1.IdSheet = sheet.asInt();
@ -1842,7 +1842,7 @@ void CStaticCharacters::readGeorges( const NLMISC::CSmartPtr<NLGEORGES::UForm> &
} }
root.getValueByName( sheetName, "Basics.Equipment.Sheath" + toString( i ) + "Ammo2.Item" ); root.getValueByName( sheetName, "Basics.Equipment.Sheath" + toString( i ) + "Ammo2.Item" );
if( sheetName != string("") ) if( !sheetName.empty() )
{ {
sheet = CSheetId( sheetName ); sheet = CSheetId( sheetName );
Sheaths[ i ].Ammo2.IdSheet = sheet.asInt(); Sheaths[ i ].Ammo2.IdSheet = sheet.asInt();