Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Hid timer function parameters in a macro (#3311)

Browse Source
This commit is contained in:
Lemongrass3110
2018-07-15 23:17:15 +02:00
committed by GitHub
parent ec1d6d28d7
commit c4d7dc76d3
49 changed files with 160 additions and 207 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/map/pet.cpp
View File

@@ -246,8 +246,7 @@ int pet_sc_check(struct map_session_data *sd, int type)
* @param id : ID of pet owner
* @return 0
*/
static int pet_hungry(int tid, unsigned int tick, int id, intptr_t data)
{
static TIMER_FUNC(pet_hungry){
struct map_session_data *sd;
struct pet_data *pd;
s_pet_db *pet_db_ptr;
@@ -1246,8 +1245,7 @@ static int pet_ai_sub_foreachclient(struct map_session_data *sd,va_list ap)
* @param data : data to pass to pet_ai_sub_foreachclient
* @return 0
*/
static int pet_ai_hard(int tid, unsigned int tick, int id, intptr_t data)
{
static TIMER_FUNC(pet_ai_hard){
map_foreachpc(pet_ai_sub_foreachclient,tick);
return 0;
@@ -1295,8 +1293,7 @@ static int pet_ai_sub_hard_lootsearch(struct block_list *bl,va_list ap)
* @param data : items that were looted
* @return 0
*/
static int pet_delay_item_drop(int tid, unsigned int tick, int id, intptr_t data)
{
static TIMER_FUNC(pet_delay_item_drop){
struct item_drop_list *list;
struct item_drop *ditem;
@@ -1387,8 +1384,7 @@ int pet_lootitem_drop(struct pet_data *pd,struct map_session_data *sd)
* @param id : ID of pet owner
* @author [Valaris], rewritten by [Skotlex]
*/
int pet_skill_bonus_timer(int tid, unsigned int tick, int id, intptr_t data)
{
TIMER_FUNC(pet_skill_bonus_timer){
struct map_session_data *sd = map_id2sd(id);
struct pet_data *pd;
int bonus;
@@ -1436,8 +1432,7 @@ int pet_skill_bonus_timer(int tid, unsigned int tick, int id, intptr_t data)
* @return 0
* @author [Valaris], rewritten by [Skotlex]
*/
int pet_recovery_timer(int tid, unsigned int tick, int id, intptr_t data)
{
TIMER_FUNC(pet_recovery_timer){
struct map_session_data *sd = map_id2sd(id);
struct pet_data *pd;
@@ -1469,8 +1464,7 @@ int pet_recovery_timer(int tid, unsigned int tick, int id, intptr_t data)
* @param tick : next time to regenerate
* @param id : ID of pet owner
*/
int pet_heal_timer(int tid, unsigned int tick, int id, intptr_t data)
{
TIMER_FUNC(pet_heal_timer){
struct map_session_data *sd = map_id2sd(id);
struct status_data *status;
struct pet_data *pd;
@@ -1513,8 +1507,7 @@ int pet_heal_timer(int tid, unsigned int tick, int id, intptr_t data)
* @param data : (unused)
* @author [Skotlex]
*/
int pet_skill_support_timer(int tid, unsigned int tick, int id, intptr_t data)
{
TIMER_FUNC(pet_skill_support_timer){
struct map_session_data *sd = map_id2sd(id);
struct pet_data *pd;
struct status_data *status;