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/skill.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/skill.c')
| -rw-r--r-- | src/map/skill.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/map/skill.c b/src/map/skill.c index 58198a355..d33d35d6e 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -2277,7 +2277,7 @@ int skill_area_sub_count (struct block_list *src, struct block_list *target, int /*========================================== * *------------------------------------------*/ -static int skill_timerskill(int tid, unsigned int tick, int id, intptr data) +static int skill_timerskill(int tid, unsigned int tick, int id, intptr_t data) { struct block_list *src = map_id2bl(id),*target; struct unit_data *ud = unit_bl2ud(src); @@ -5682,7 +5682,7 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in /*========================================== * *------------------------------------------*/ -int skill_castend_id(int tid, unsigned int tick, int id, intptr data) +int skill_castend_id(int tid, unsigned int tick, int id, intptr_t data) { struct block_list *target, *src; struct map_session_data *sd; @@ -5972,7 +5972,7 @@ int skill_castend_id(int tid, unsigned int tick, int id, intptr data) /*========================================== * *------------------------------------------*/ -int skill_castend_pos(int tid, unsigned int tick, int id, intptr data) +int skill_castend_pos(int tid, unsigned int tick, int id, intptr_t data) { struct block_list* src = map_id2bl(id); int maxcount; @@ -10490,7 +10490,7 @@ static int skill_unit_timer_sub (DBKey key, void* data, va_list ap) /*========================================== * Executes on all skill units every SKILLUNITTIMER_INTERVAL miliseconds. *------------------------------------------*/ -int skill_unit_timer(int tid, unsigned int tick, int id, intptr data) +int skill_unit_timer(int tid, unsigned int tick, int id, intptr_t data) { map_freeblock_lock(); @@ -11186,7 +11186,7 @@ int skill_arrow_create (struct map_session_data *sd, int nameid) /*========================================== * *------------------------------------------*/ -int skill_blockpc_end(int tid, unsigned int tick, int id, intptr data) +int skill_blockpc_end(int tid, unsigned int tick, int id, intptr_t data) { struct map_session_data *sd = map_id2sd(id); if (data <= 0 || data >= MAX_SKILL) @@ -11217,7 +11217,7 @@ int skill_blockpc_start(struct map_session_data *sd, int skillid, int tick) return 0; } -int skill_blockhomun_end(int tid, unsigned int tick, int id, intptr data) //[orn] +int skill_blockhomun_end(int tid, unsigned int tick, int id, intptr_t data) //[orn] { struct homun_data *hd = (TBL_HOM*) map_id2bl(id); if (data <= 0 || data >= MAX_SKILL) @@ -11243,7 +11243,7 @@ int skill_blockhomun_start(struct homun_data *hd, int skillid, int tick) //[orn] return add_timer(gettick() + tick, skill_blockhomun_end, hd->bl.id, skillid); } -int skill_blockmerc_end(int tid, unsigned int tick, int id, intptr data) //[orn] +int skill_blockmerc_end(int tid, unsigned int tick, int id, intptr_t data) //[orn] { struct mercenary_data *md = (TBL_MER*)map_id2bl(id); if( data <= 0 || data >= MAX_SKILL ) |