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

Fixed: Warnings with clang

Browse source 
--HG--
branch : develop
This commit is contained in:
kervala 2017-06-20 12:28:46 +02:00
parent 50cfe0ff7c
commit de8a6ba1b5
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
code/ryzom/client/src/item_group_manager.cpp
View file

@ -742,18 +742,21 @@ std::vector<CInventoryItem> CItemGroupManager::matchingItems(CItemGroup *group,
//Not very clean, but no choice, it's ugly time //Not very clean, but no choice, it's ugly time
std::vector<CInventoryItem> out; std::vector<CInventoryItem> out;
std::string dbPath = toDbPath(inventory); std::string dbPath = toDbPath(inventory);
if(dbPath.empty())
if (dbPath.empty())
{ {
nldebug("Inventory type %s not supported", INVENTORIES::toString(inventory).c_str()); nldebug("Inventory type %s not supported", INVENTORIES::toString(inventory).c_str());
return out; return out;
} }
IListSheetBase *pList = dynamic_cast<IListSheetBase*>(CWidgetManager::getInstance()->getElementFromId(dbPath)); IListSheetBase *pList = dynamic_cast<IListSheetBase*>(CWidgetManager::getInstance()->getElementFromId(dbPath));
for(uint i=0; i < MAX_BAGINV_ENTRIES; i++) for(uint i=0; i < MAX_BAGINV_ENTRIES; i++)
{ {
CDBCtrlSheet *pCS = pList->getSheet(i); CDBCtrlSheet *pCS = pList->getSheet(i);
SLOT_EQUIPMENT::TSlotEquipment slot; SLOT_EQUIPMENT::TSlotEquipment slot;
if(group->contains(pCS, slot))
if (group->contains(pCS, slot))
{ {
//Sometimes, index in the list differ from the index in DB, and we need the index in DB, not the one from the list //Sometimes, index in the list differ from the index in DB, and we need the index in DB, not the one from the list
std::string dbPath = pCS->getSheet(); std::string dbPath = pCS->getSheet();
@ -761,7 +764,12 @@ std::vector<CInventoryItem> CItemGroupManager::matchingItems(CItemGroup *group,
std::string indexS = dbPath.substr(found+1); std::string indexS = dbPath.substr(found+1);
uint32 index; uint32 index;
NLMISC::fromString(indexS, index); NLMISC::fromString(indexS, index);
if(i != index) nldebug("Index from list is %d, where index from DB is %d", i, index);
if (i != index)
{
nldebug("Index from list is %d, where index from DB is %d", i, index);
}
out.push_back(CInventoryItem(pCS, inventory, index, slot)); out.push_back(CInventoryItem(pCS, inventory, index, slot));
} }
} }