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/unit.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/unit.c')
| -rw-r--r-- | src/map/unit.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/map/unit.c b/src/map/unit.c index b1cca0d4c..2165532b4 100644 --- a/src/map/unit.c +++ b/src/map/unit.c @@ -51,8 +51,8 @@ struct unit_data* unit_bl2ud(struct block_list *bl) return NULL; } -static int unit_attack_timer(int tid, unsigned int tick, int id, intptr data); -static int unit_walktoxy_timer(int tid, unsigned int tick, int id, intptr data); +static int unit_attack_timer(int tid, unsigned int tick, int id, intptr_t data); +static int unit_walktoxy_timer(int tid, unsigned int tick, int id, intptr_t data); int unit_walktoxy_sub(struct block_list *bl) { @@ -106,7 +106,7 @@ int unit_walktoxy_sub(struct block_list *bl) return 1; } -static int unit_walktoxy_timer(int tid, unsigned int tick, int id, intptr data) +static int unit_walktoxy_timer(int tid, unsigned int tick, int id, intptr_t data) { int i; int x,y,dx,dy; @@ -263,7 +263,7 @@ static int unit_walktoxy_timer(int tid, unsigned int tick, int id, intptr data) return 0; } -static int unit_delay_walktoxy_timer(int tid, unsigned int tick, int id, intptr data) +static int unit_delay_walktoxy_timer(int tid, unsigned int tick, int id, intptr_t data) { struct block_list *bl = map_id2bl(id); @@ -327,7 +327,7 @@ int unit_walktoxy( struct block_list *bl, short x, short y, int flag) if((bl)->type == BL_MOB && (flag)) \ ((TBL_MOB*)(bl))->state.skillstate = ((TBL_MOB*)(bl))->state.aggressive?MSS_FOLLOW:MSS_RUSH; -static int unit_walktobl_sub(int tid, unsigned int tick, int id, intptr data) +static int unit_walktobl_sub(int tid, unsigned int tick, int id, intptr_t data) { struct block_list *bl = map_id2bl(id); struct unit_data *ud = bl?unit_bl2ud(bl):NULL; @@ -847,7 +847,7 @@ int unit_can_move(struct block_list *bl) * Resume running after a walk delay *------------------------------------------*/ -int unit_resume_running(int tid, unsigned int tick, int id, intptr data) +int unit_resume_running(int tid, unsigned int tick, int id, intptr_t data) { struct unit_data *ud = (struct unit_data *)data; @@ -891,7 +891,7 @@ int unit_set_walkdelay(struct block_list *bl, unsigned int tick, int delay, int //Resume running after can move again [Kevin] if(ud->state.running) { - add_timer(ud->canmove_tick, unit_resume_running, bl->id, (intptr)ud); + add_timer(ud->canmove_tick, unit_resume_running, bl->id, (intptr_t)ud); } else { @@ -1655,7 +1655,7 @@ static int unit_attack_timer_sub(struct block_list* src, int tid, unsigned int t return 1; } -static int unit_attack_timer(int tid, unsigned int tick, int id, intptr data) +static int unit_attack_timer(int tid, unsigned int tick, int id, intptr_t data) { struct block_list *bl; bl = map_id2bl(id); |