diff options
| author | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-06-30 09:14:21 +0000 |
|---|---|---|
| committer | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-06-30 09:14:21 +0000 |
| commit | 09c4e2b26b2a7f1a06202b300f0dc1ce1fe04abf (patch) | |
| tree | 9971dee8e7148436dcb49af51bb820d764f10c21 /src/map/pet.c | |
| parent | dd73c6ea546a8828653cdce38a52f575cbdd3b96 (diff) | |
| download | hercules-09c4e2b26b2a7f1a06202b300f0dc1ce1fe04abf.tar.gz hercules-09c4e2b26b2a7f1a06202b300f0dc1ce1fe04abf.tar.bz2 hercules-09c4e2b26b2a7f1a06202b300f0dc1ce1fe04abf.tar.xz hercules-09c4e2b26b2a7f1a06202b300f0dc1ce1fe04abf.zip | |
Replaced custom type 'intptr' with standard 'intptr_t'.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14873 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/pet.c')
| -rw-r--r-- | src/map/pet.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/map/pet.c b/src/map/pet.c index 43c54d74a..a0f652f2b 100644 --- a/src/map/pet.c +++ b/src/map/pet.c @@ -189,7 +189,7 @@ int pet_sc_check(struct map_session_data *sd, int type) return 0; } -static int pet_hungry(int tid, unsigned int tick, int id, intptr data) +static int pet_hungry(int tid, unsigned int tick, int id, intptr_t data) { struct map_session_data *sd; struct pet_data *pd; @@ -935,7 +935,7 @@ static int pet_ai_sub_foreachclient(struct map_session_data *sd,va_list ap) return 0; } -static int pet_ai_hard(int tid, unsigned int tick, int id, intptr data) +static int pet_ai_hard(int tid, unsigned int tick, int id, intptr_t data) { map_foreachpc(pet_ai_sub_foreachclient,tick); @@ -969,7 +969,7 @@ static int pet_ai_sub_hard_lootsearch(struct block_list *bl,va_list ap) return 0; } -static int pet_delay_item_drop(int tid, unsigned int tick, int id, intptr data) +static int pet_delay_item_drop(int tid, unsigned int tick, int id, intptr_t data) { struct item_drop_list *list; struct item_drop *ditem, *ditem_prev; @@ -1030,7 +1030,7 @@ int pet_lootitem_drop(struct pet_data *pd,struct map_session_data *sd) pd->ud.canact_tick = gettick()+10000; // 10*1000msの間拾わない if (dlist->item) - add_timer(gettick()+540,pet_delay_item_drop,0,(intptr)dlist); + add_timer(gettick()+540,pet_delay_item_drop,0,(intptr_t)dlist); else ers_free(item_drop_list_ers, dlist); return 1; @@ -1039,7 +1039,7 @@ int pet_lootitem_drop(struct pet_data *pd,struct map_session_data *sd) /*========================================== * pet bonus giving skills [Valaris] / Rewritten by [Skotlex] *------------------------------------------*/ -int pet_skill_bonus_timer(int tid, unsigned int tick, int id, intptr data) +int pet_skill_bonus_timer(int tid, unsigned int tick, int id, intptr_t data) { struct map_session_data *sd=map_id2sd(id); struct pet_data *pd; @@ -1081,7 +1081,7 @@ int pet_skill_bonus_timer(int tid, unsigned int tick, int id, intptr data) /*========================================== * pet recovery skills [Valaris] / Rewritten by [Skotlex] *------------------------------------------*/ -int pet_recovery_timer(int tid, unsigned int tick, int id, intptr data) +int pet_recovery_timer(int tid, unsigned int tick, int id, intptr_t data) { struct map_session_data *sd=map_id2sd(id); struct pet_data *pd; @@ -1109,7 +1109,7 @@ int pet_recovery_timer(int tid, unsigned int tick, int id, intptr data) return 0; } -int pet_heal_timer(int tid, unsigned int tick, int id, intptr data) +int pet_heal_timer(int tid, unsigned int tick, int id, intptr_t data) { struct map_session_data *sd=map_id2sd(id); struct status_data *status; @@ -1147,7 +1147,7 @@ int pet_heal_timer(int tid, unsigned int tick, int id, intptr data) /*========================================== * pet support skills [Skotlex] *------------------------------------------*/ -int pet_skill_support_timer(int tid, unsigned int tick, int id, intptr data) +int pet_skill_support_timer(int tid, unsigned int tick, int id, intptr_t data) { struct map_session_data *sd=map_id2sd(id); struct pet_data *pd; |