Fixed: Some warnings
This commit is contained in:
parent
bc8490adb7
commit
43bbfe3da7
7 changed files with 24 additions and 24 deletions
|
@ -549,27 +549,27 @@ namespace NLGUI
|
|||
if( editorMode )
|
||||
{
|
||||
prop = (char*) xmlGetProp( cur, BAD_CAST "onover" );
|
||||
if( prop != NULL )
|
||||
if (prop)
|
||||
mapAHString( "onover", std::string( (const char*)prop ) );
|
||||
|
||||
prop = (char*) xmlGetProp( cur, BAD_CAST "onclick_l" );
|
||||
if( prop != NULL )
|
||||
if (prop)
|
||||
mapAHString( "onclick_l", std::string( (const char*)prop ) );
|
||||
|
||||
prop = (char*) xmlGetProp( cur, BAD_CAST "ondblclick_l" );
|
||||
if( prop != NULL )
|
||||
if (prop)
|
||||
mapAHString( "ondblclick_l", std::string( (const char*)prop ) );
|
||||
|
||||
prop = (char*) xmlGetProp( cur, BAD_CAST "onclick_r" );
|
||||
if( prop != NULL )
|
||||
if (prop)
|
||||
mapAHString( "onclick_r", std::string( (const char*)prop ) );
|
||||
|
||||
prop = (char*) xmlGetProp( cur, BAD_CAST "onlongclick_l" );
|
||||
if( prop != NULL )
|
||||
if (prop)
|
||||
mapAHString( "onlongclick_l", std::string( (const char*)prop ) );
|
||||
|
||||
prop = (char*) xmlGetProp( cur, BAD_CAST "onclock_tick" );
|
||||
if( prop != NULL )
|
||||
if (prop)
|
||||
mapAHString( "onclock_tick", std::string( (const char*)prop ) );
|
||||
}
|
||||
|
||||
|
|
|
@ -540,7 +540,7 @@ namespace NLGUI
|
|||
if( editorMode )
|
||||
{
|
||||
prop = (char*) xmlGetProp( cur, BAD_CAST "onenter" );
|
||||
if( prop != NULL )
|
||||
if (prop)
|
||||
mapAHString( "onenter", std::string( (const char*)prop ) );
|
||||
}
|
||||
|
||||
|
|
|
@ -47,8 +47,8 @@ void CHairSet::init (NLMISC::IProgressCallback &progress)
|
|||
const CItemSheet *item = SheetMngr.getItem(SLOTTYPE::HEAD_SLOT, k);
|
||||
if( (item) && (!item->getShape().empty()) )
|
||||
{
|
||||
std::string itemName = item->getShape();
|
||||
itemName = NLMISC::strlwr(itemName);
|
||||
std::string itemName = NLMISC::toLower(item->getShape());
|
||||
|
||||
if (item->getShape().find("cheveux", 0) != std::string::npos)
|
||||
{
|
||||
// get race
|
||||
|
|
|
@ -257,7 +257,7 @@ void CAnimalPositionState::serial(NLMISC::IStream &f)
|
|||
// ***************************************************************************
|
||||
CEntityCL *CNamedEntityPositionState::getEntity()
|
||||
{
|
||||
if (!dbOk()) return false;
|
||||
if (!dbOk()) return NULL;
|
||||
return EntitiesMngr.getEntityByName(_Name->getValue32());
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue