From: tomtt <to...@us...> - 2007-07-31 01:02:31
|
Update of /cvsroot/planeshift/planeshift/src/server In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31198 Modified Files: slotmanager.cpp Log Message: Added error checks to AddToContainer() calls since it can now return error. Index: slotmanager.cpp =================================================================== RCS file: /cvsroot/planeshift/planeshift/src/server/slotmanager.cpp,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** slotmanager.cpp 26 Jul 2007 01:03:41 -0000 1.16 --- slotmanager.cpp 31 Jul 2007 01:02:32 -0000 1.17 *************** *** 204,208 **** { worldContainer->RemoveFromContainer(itemProposed,fromClient); ! worldContainer->AddToContainer(itemProposed, fromClient, msg.toSlot); } --- 204,212 ---- { worldContainer->RemoveFromContainer(itemProposed,fromClient); ! if ( !worldContainer->AddToContainer(itemProposed, fromClient, msg.toSlot) ) ! { ! Error2("Cannot add item into container slot %n.\n", msg.toSlot); ! return; ! } } *************** *** 395,399 **** return; } ! worldContainer->AddToContainer(newItem, fromClient, msg.toSlot); psserver->GetWorkManager()->StartAutoWork(fromClient, worldContainer, newItem, msg.stackCount); } --- 399,407 ---- return; } ! if (!worldContainer->AddToContainer(newItem, fromClient, msg.toSlot)) ! { ! Error2("Cannot add item into container slot %n.\n", msg.toSlot); ! return; ! } psserver->GetWorkManager()->StartAutoWork(fromClient, worldContainer, newItem, msg.stackCount); } |