From 4402e2134c5a67ac31182c532743a8007d40f5c5 Mon Sep 17 00:00:00 2001 From: kaetemi Date: Tue, 26 Aug 2014 13:48:34 +0200 Subject: [PATCH] Remove warnings, ref #177 --- code/ryzom/client/src/net_manager.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/code/ryzom/client/src/net_manager.cpp b/code/ryzom/client/src/net_manager.cpp index 77ebf9c79..4b37b698a 100644 --- a/code/ryzom/client/src/net_manager.cpp +++ b/code/ryzom/client/src/net_manager.cpp @@ -2798,7 +2798,6 @@ void updateInventoryFromStream (NLMISC::CBitMemStream &impulse, const CInventory // Apply property to database CCDBNodeBranch *slotNode = safe_cast(inventoryNode->getNode( (uint16)itemSlot.getSlotIndex() )); CCDBNodeLeaf *leafNode = type_cast(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 ); 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 // properties in TItemPropId, because the actual database leaves may have // 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(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 ); leafNode->setPropCheckGC( serverTick, 0 ); }