mirror of
https://port.numenaute.org/aleajactaest/khanat-opennel-code.git
synced 2024-11-10 01:09:50 +00:00
Fixed: Warnings with clang
--HG-- branch : develop
This commit is contained in:
parent
50cfe0ff7c
commit
de8a6ba1b5
1 changed files with 11 additions and 3 deletions
|
@ -742,6 +742,7 @@ 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());
|
||||||
|
@ -749,10 +750,12 @@ std::vector<CInventoryItem> CItemGroupManager::matchingItems(CItemGroup *group,
|
||||||
}
|
}
|
||||||
|
|
||||||
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
|
||||||
|
@ -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));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue