[Planeshift-cvs] CVS: planeshift/src/server workmanager.h,1.17,1.18

[Thomas T. <to...@us...>]

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

Modified Files:
	workmanager.h 
Log Message:
Removed max transformation time.
Transform items in hand as well as in container.
Toggle use command.

Index: workmanager.h
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/server/workmanager.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** workmanager.h	1 Apr 2004 22:04:58 -0000	1.17
--- workmanager.h	12 May 2004 01:13:43 -0000	1.18
***************
*** 108,120 ****
  
      void ValidateUseWork(Client *client);
      bool ValidateCombinations();
      bool IsCombinable(long &resultId, int &resultQty);
      bool IsTransformable(long targetId, int targetQty);
- //?    bool DoTransformation    if (!StartTransformation(combinationId, combinationQty ) )
      bool TransformContainedItem(long newId, int newQty, float itemQuality);
      bool WorkComplete();
  
      bool ValidateTarget(Client* client);
!     void LoadLocalVars(Client* client, psItem* workItem);
      bool ValidateWork();
      bool IsOnHand(long equipId);
--- 108,123 ----
  
      void ValidateUseWork(Client *client);
+ 
+ 
      bool ValidateCombinations();
      bool IsCombinable(long &resultId, int &resultQty);
      bool IsTransformable(long targetId, int targetQty);
      bool TransformContainedItem(long newId, int newQty, float itemQuality);
+     bool TransformSlotItem(int slot, long newId, int newQty, float itemQuality);
+     void StartTransformationEvent(psTradeTransformations* trans);
      bool WorkComplete();
  
      bool ValidateTarget(Client* client);
!     bool LoadLocalVars(Client* client);
      bool ValidateWork();
      bool IsOnHand(long equipId);
***************
*** 124,128 ****
  
      void Initialize();
!     void HandleUse(Client *client, bool on);
      void GoodTransformation(psTradeTransformations* trans);
      void GarbageTransformation(psTradeTransformations* trans);
--- 127,131 ----
  
      void Initialize();
!     void HandleUse(Client *client);
      void GoodTransformation(psTradeTransformations* trans);
      void GarbageTransformation(psTradeTransformations* trans);