[Planeshift-cvs] CVS: planeshift/src/server slotmanager.cpp, 1.24, 1.25

[Kemedes <ke...@us...>]

Update of /cvsroot/planeshift/planeshift/src/server
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30005/src/server

Modified Files:
	slotmanager.cpp 
Log Message:
Fixed FS#176 and FS#177


Index: slotmanager.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/server/slotmanager.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** slotmanager.cpp	25 Aug 2007 08:04:23 -0000	1.24
--- slotmanager.cpp	31 Aug 2007 18:03:45 -0000	1.25
***************
*** 545,551 ****
--- 545,553 ----
                  {
                      // easy case is to stack compatible items
+                     chr->Inventory().SetLockEncumbranceState(true);
                      psItem *stack = chr->Inventory().RemoveItem(NULL, srcSlot, msg.stackCount);
                      item->CombineStack(stack);
                      item->Save(false);
+                     chr->Inventory().SetLockEncumbranceState(false);
                      // Updating Containers view if needed
                      if(destSlot > 99)