[Planeshift-cvs] CVS: planeshift/src/server psserverchar.cpp,1.351,1.352

[tomtt <to...@us...>]

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

Modified Files:
	psserverchar.cpp 
Log Message:
Commented out equiped container code that interfered with auto-transform containers.

Index: psserverchar.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/server/psserverchar.cpp,v
retrieving revision 1.351
retrieving revision 1.352
diff -C2 -d -r1.351 -r1.352
*** psserverchar.cpp	22 Feb 2006 22:19:43 -0000	1.351
--- psserverchar.cpp	3 Mar 2006 03:42:32 -0000	1.352
***************
*** 2187,2191 ****
  {
      psItem* holdingItem=NULL;
!     // Check to see if this is from a container in the inventory.
      if ( mesg.fromParentContainer != 0 )
      {
--- 2187,2191 ----
  {
      psItem* holdingItem=NULL;
! /*    // Check to see if this is from a container in the inventory.
      if ( mesg.fromParentContainer != 0 )
      {
***************
*** 2198,2202 ****
      // The item came from elsewhere so figure out where.
      else
!     {
          switch ( mesg.fromContainer )
          {   
--- 2198,2202 ----
      // The item came from elsewhere so figure out where.
      else
!     { */
          switch ( mesg.fromContainer )
          {   
***************
*** 2285,2293 ****
                          // Stop any work going on with existing item.
                          psserver->GetWorkManager()->StopWork(fromClient, item);
!                         if ( holdingContainer->GetCanTransform() )
!                         {
                              // Try to autotransform what is left. 
                              psserver->GetWorkManager()->StartAutoWork(fromClient, holdingContainer, item, item->GetStackCount());
!                         }                            
                      }
                  }
--- 2285,2293 ----
                          // Stop any work going on with existing item.
                          psserver->GetWorkManager()->StopWork(fromClient, item);
! //                        if ( holdingContainer->GetCanTransform() )
! //                        {
                              // Try to autotransform what is left. 
                              psserver->GetWorkManager()->StartAutoWork(fromClient, holdingContainer, item, item->GetStackCount());
! //                        }                            
                      }
                  }
***************
*** 2295,2299 ****
              }
          }        
!     }    
      
      return holdingItem;
--- 2295,2299 ----
              }
          }        
! //    }    
      
      return holdingItem;
***************
*** 2411,2415 ****
  void SlotManager::PlaceHoldingItem( psSlotMovementMsg& mesg )
  {   
!     if ( mesg.toParentContainer != 0 )
      {        
          psItem* container = FindContainer( fromClient, mesg.toContainer, mesg.toParentContainer );
--- 2411,2415 ----
  void SlotManager::PlaceHoldingItem( psSlotMovementMsg& mesg )
  {   
! /*    if ( mesg.toParentContainer != 0 )
      {        
          psItem* container = FindContainer( fromClient, mesg.toContainer, mesg.toParentContainer );
***************
*** 2431,2435 ****
      }
      else
!     {
          switch ( mesg.toContainer )
          {   
--- 2431,2435 ----
      }
      else
! */    {
          switch ( mesg.toContainer )
          {   
***************
*** 2593,2602 ****
                                                      
                          // check to see if this container will start an auto transform of item(s)
!                         if ( toContainer->GetCanTransform() )
!                         {
                              psItem *item = toContainer->GetItemInSlot(mesg.toSlot);
                              psserver->GetWorkManager()->StartAutoWork(
                                  fromClient, toContainer, item, item->GetStackCount());
!                         }
                          holdingItem = NULL;
                      }
--- 2593,2602 ----
                                                      
                          // check to see if this container will start an auto transform of item(s)
! //                        if ( toContainer->GetCanTransform() )
! //                        {
                              psItem *item = toContainer->GetItemInSlot(mesg.toSlot);
                              psserver->GetWorkManager()->StartAutoWork(
                                  fromClient, toContainer, item, item->GetStackCount());
! //                        }
                          holdingItem = NULL;
                      }