[Planeshift-cvs] CVS: planeshift/src/server workmanager.h, 1.66, 1.67
|
From: tomtt <tomtt@us...> - 2006-10-31 01:48:38
|
Update of /cvsroot/planeshift/planeshift/src/server
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28542
Modified Files:
workmanager.h
Log Message:
Allow design item-less transformations.
Fix bug in problem with reporting bad combination errors.
Fixed bug where guild number was not being properly set.
Fixed bug where clanup event would not properly handle player logging out.
Only apply random quality change for skilled transforms.
Index: workmanager.h
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/server/workmanager.h,v
retrieving revision 1.66
retrieving revision 1.67
diff -C2 -d -r1.66 -r1.67
*** workmanager.h 24 Oct 2006 00:26:01 -0000 1.66
--- workmanager.h 31 Oct 2006 01:48:36 -0000 1.67
***************
*** 62,66 ****
TRANSFORM_TOO_MANY_ITEMS = 0x0800, ///< Tried to transform too many items.
TRANSFORM_BAD_USE = 0x1000, ///< Use of item or ammounts not correct.
! TRANSFORM_NO_STAMINA = 0x2000 ///< Too tired to do trade skill work.
};
--- 62,67 ----
TRANSFORM_TOO_MANY_ITEMS = 0x0800, ///< Tried to transform too many items.
TRANSFORM_BAD_USE = 0x1000, ///< Use of item or ammounts not correct.
! TRANSFORM_NO_STAMINA = 0x2000, ///< Too tired to do trade skill work.
! TRANSFORM_GARBAGE = 0x8000 ///< There was a garbage transform that matched correctly
};
***************
*** 339,343 ****
/** Check to see if there is a possible trasnform available.
! * @param patternID The current pattern to use
* @param targetID the id of the item trying to transform.
* @param targetQty The stack count of the item to transform.
--- 340,345 ----
/** Check to see if there is a possible trasnform available.
! * @param singlePatternID The current single pattern to use
! * @param groupPatternID The current group pattern to use
* @param targetID the id of the item trying to transform.
* @param targetQty The stack count of the item to transform.
***************
*** 345,350 ****
* @return A integer that indicates pattern match status.
*/
int IsTransformable(uint32 patternId, uint32 targetId, int targetQty);
!
bool TransformContainedItem(psItem* oldItem, uint32 newId, int newQty, float itemQuality);
psItem* CombineContainedItem(uint32 newId, int newQty, float itemQuality, psItem* containerItem);
--- 347,361 ----
* @return A integer that indicates pattern match status.
*/
+ int AnyTransform(uint32 singlePatternId, uint32 groupPatternId, uint32 targetId, int targetQty);
+
+ /** Check to see if there is a possible trasnform available.
+ * @param patternId The current pattern to use
+ * @param targetId the id of the item trying to transform.
+ * @param targetQty The stack count of the item to transform.
+ *
+ * @return A integer that indicates pattern match status.
+ */
int IsTransformable(uint32 patternId, uint32 targetId, int targetQty);
!
bool TransformContainedItem(psItem* oldItem, uint32 newId, int newQty, float itemQuality);
psItem* CombineContainedItem(uint32 newId, int newQty, float itemQuality, psItem* containerItem);
***************
*** 354,358 ****
void StartTransformationEvent(int transType, int transSlot, int resultQty, float resultQuality, psItem* autoItem);
! void StartCleanupEvent(Client* client, psItem* item, gemActor* worker);
bool ValidateTarget(Client* client);
--- 365,369 ----
void StartTransformationEvent(int transType, int transSlot, int resultQty, float resultQuality, psItem* autoItem);
! void StartCleanupEvent(int transType, Client* client, psItem* item, gemActor* worker);
bool ValidateTarget(Client* client);
|