Ryzom
/
ryzom-core
1
1
Fork 0
Code Issues 38 Pull Requests Projects 1 Releases 1 Activity

Remove warnings, ref #177

Browse Source
hg/feature/cdb-packed
kaetemi 10 years ago
parent 031cd3b68d
commit 4402e2134c
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File

3
code/ryzom/client/src/net_manager.cpp
Unescape Escape View File

@ -2798,7 +2798,6 @@ void updateInventoryFromStream (NLMISC::CBitMemStream &impulse, const CInventory
// Apply property to database // Apply property to database
CCDBNodeBranch *slotNode = safe_cast<CCDBNodeBranch*>(inventoryNode->getNode( (uint16)itemSlot.getSlotIndex() )); CCDBNodeBranch *slotNode = safe_cast<CCDBNodeBranch*>(inventoryNode->getNode( (uint16)itemSlot.getSlotIndex() ));
CCDBNodeLeaf *leafNode = type_cast<CCDBNodeLeaf*>(slotNode->find( string(INVENTORIES::CItemSlot::ItemPropStr[itemSlot.getOneProp().ItemPropId]) )); CCDBNodeLeaf *leafNode = type_cast<CCDBNodeLeaf*>(slotNode->find( string(INVENTORIES::CItemSlot::ItemPropStr[itemSlot.getOneProp().ItemPropId]) ));
if (!leafNode) nlwarning("BUG: Inventory slot property missing in database (iuOneProp) (%s, %i, %s)", slotNode->getFullName().c_str(), (sint)itemSlot.getOneProp().ItemPropId, INVENTORIES::CItemSlot::ItemPropStr[itemSlot.getOneProp().ItemPropId]);
SKIP_IF( !leafNode, "Inventory slot property missing in database", continue ); SKIP_IF( !leafNode, "Inventory slot property missing in database", continue );
leafNode->setPropCheckGC( serverTick, (sint64)itemSlot.getOneProp().ItemPropValue ); leafNode->setPropCheckGC( serverTick, (sint64)itemSlot.getOneProp().ItemPropValue );
@ -2816,8 +2815,8 @@ void updateInventoryFromStream (NLMISC::CBitMemStream &impulse, const CInventory
// Instead of clearing all leaves (by index), we must find and clear only the // Instead of clearing all leaves (by index), we must find and clear only the
// properties in TItemPropId, because the actual database leaves may have // properties in TItemPropId, because the actual database leaves may have
// less properties, and because we must not clear the leaf INFO_VERSION. // less properties, and because we must not clear the leaf INFO_VERSION.
// NOTE: For example, only player BAG inventory has WORNED leaf.
CCDBNodeLeaf *leafNode = type_cast<CCDBNodeLeaf*>(slotNode->find( string(INVENTORIES::CItemSlot::ItemPropStr[i]) )); CCDBNodeLeaf *leafNode = type_cast<CCDBNodeLeaf*>(slotNode->find( string(INVENTORIES::CItemSlot::ItemPropStr[i]) ));
if (!leafNode) nlwarning("BUG: Inventory slot property missing in database (iuReset) (%s, %i, %s)", slotNode->getFullName().c_str(), (sint)i, INVENTORIES::CItemSlot::ItemPropStr[i]);
SKIP_IF( !leafNode, "Inventory slot property missing in database", continue ); SKIP_IF( !leafNode, "Inventory slot property missing in database", continue );
leafNode->setPropCheckGC( serverTick, 0 ); leafNode->setPropCheckGC( serverTick, 0 );
} }

Write Preview
Loading…
Cancel
Save