From: tomtt <to...@us...> - 2006-06-13 00:44:27
|
Update of /cvsroot/planeshift/planeshift/src/server In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3775 Modified Files: workmanager.h Log Message: Renamed workevent pointer from reserved word "event" to "workEvent". Added transaction item to ApplySkills call to set quality. Index: workmanager.h =================================================================== RCS file: /cvsroot/planeshift/planeshift/src/server/workmanager.h,v retrieving revision 1.61 retrieving revision 1.62 diff -C2 -d -r1.61 -r1.62 *** workmanager.h 11 Jun 2006 23:14:40 -0000 1.61 --- workmanager.h 13 Jun 2006 00:44:25 -0000 1.62 *************** *** 189,193 **** * @param event The work event that was in the queue to fire. */ ! void HandleWorkEvent(psWorkGameEvent* event); /** Handles a cleanup event. Basically removing discarded items from public containers. --- 189,193 ---- * @param event The work event that was in the queue to fire. */ ! void HandleWorkEvent(psWorkGameEvent* workEvent); /** Handles a cleanup event. Basically removing discarded items from public containers. *************** *** 195,199 **** * @param event The work event that was in the queue to fire. */ ! void HandleCleanupEvent(psWorkGameEvent* event); /** Handles a resource/harvesting event. Basically the production events. --- 195,199 ---- * @param event The work event that was in the queue to fire. */ ! void HandleCleanupEvent(psWorkGameEvent* workEvent); /** Handles a resource/harvesting event. Basically the production events. *************** *** 201,205 **** * @param event The work event that was in the queue to fire. */ ! void HandleProductionEvent(psWorkGameEvent* event); /** Handles a repair event, which occurs after a few seconds of repairing an item. --- 201,205 ---- * @param event The work event that was in the queue to fire. */ ! void HandleProductionEvent(psWorkGameEvent* workEvent); /** Handles a repair event, which occurs after a few seconds of repairing an item. *************** *** 207,212 **** * @param event The work event that was in the queue to fire. */ ! void HandleRepairEvent(psWorkGameEvent* event); ! void LockpickComplete(psWorkGameEvent* event); //@} --- 207,212 ---- * @param event The work event that was in the queue to fire. */ ! void HandleRepairEvent(psWorkGameEvent* workEvent); ! void LockpickComplete(psWorkGameEvent* workEvent); //@} *************** *** 370,374 **** void Initialize(); ! bool ApplySkills(float factor); void HandleRepair(Client *client); void HandleProduction(Client *client,const char *type,const char *reward); --- 370,374 ---- void Initialize(); ! bool ApplySkills(float factor, psItem* transItem); void HandleRepair(Client *client); void HandleProduction(Client *client,const char *type,const char *reward); |