[Planeshift-cvs] CVS: planeshift/src/client psslotmgr.cpp, 1.33, 1.34 psslotmgr.h, 1.12, 1.13

[Arianna B. <ar...@us...>]

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

Modified Files:
	psslotmgr.cpp psslotmgr.h 
Log Message:
Fixed bug #2714

Index: psslotmgr.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/psslotmgr.cpp,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** psslotmgr.cpp	8 Jun 2007 12:02:54 -0000	1.33
--- psslotmgr.cpp	24 Jun 2007 09:47:29 -0000	1.34
***************
*** 135,139 ****
  }
   
! void psSlotManager::Handle( pawsSlot* slot )
  {
      printf("In psSlotManager::Handle()\n");
--- 135,139 ----
  }
   
! void psSlotManager::Handle( pawsSlot* slot, bool grabAll )
  {
      printf("In psSlotManager::Handle()\n");
***************
*** 153,157 ****
              int tmpID = (int)slotsInUse.Push(slot);
  
!             if ( stackCount > 1 )
              {
                  csString max;
--- 153,157 ----
              int tmpID = (int)slotsInUse.Push(slot);
  
!             if ( stackCount > 1 && !grabAll)
              {
                  csString max;
***************
*** 162,166 ****
              }
              else // call directly
!                 OnNumberEntered("StackCount",tmpID,1);
          }
      }
--- 162,166 ----
              }
              else // call directly
!                 OnNumberEntered("StackCount",tmpID, stackCount);
          }
      }

Index: psslotmgr.h
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/psslotmgr.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** psslotmgr.h	8 Jun 2007 12:02:54 -0000	1.12
--- psslotmgr.h	24 Jun 2007 09:47:29 -0000	1.13
***************
*** 52,56 ****
      virtual ~psSlotManager();
      
!     void Handle( pawsSlot* slot );
      void SetDragDetails( pawsSlot* slot, int count );
      
--- 52,56 ----
      virtual ~psSlotManager();
      
!     void Handle( pawsSlot* slot, bool grabAll = false );
      void SetDragDetails( pawsSlot* slot, int count );