diff options
| author | FlavioJS <FlavioJS@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-04-21 21:34:31 +0000 |
|---|---|---|
| committer | FlavioJS <FlavioJS@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-04-21 21:34:31 +0000 |
| commit | bc9e0854a2c7336c6f7b4a388b5ff00b9f4865e8 (patch) | |
| tree | 3aa7da07fc43116707de469034c7cf8186e8b2d5 /src/map/unit.c | |
| parent | b21c980c03ea476e324c714a9ad2d5eff5cb981d (diff) | |
| download | hercules-bc9e0854a2c7336c6f7b4a388b5ff00b9f4865e8.tar.gz hercules-bc9e0854a2c7336c6f7b4a388b5ff00b9f4865e8.tar.bz2 hercules-bc9e0854a2c7336c6f7b4a388b5ff00b9f4865e8.tar.xz hercules-bc9e0854a2c7336c6f7b4a388b5ff00b9f4865e8.zip | |
* Changed the data field of timers from int to intptr.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12633 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/unit.c')
| -rw-r--r-- | src/map/unit.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/map/unit.c b/src/map/unit.c index 88bfaab47..a6e3ec914 100644 --- a/src/map/unit.c +++ b/src/map/unit.c @@ -46,8 +46,8 @@ struct unit_data* unit_bl2ud(struct block_list *bl) return NULL; } -static int unit_attack_timer(int tid,unsigned int tick,int id,int data); -static int unit_walktoxy_timer(int tid,unsigned int tick,int id,int data); +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); int unit_walktoxy_sub(struct block_list *bl) { @@ -101,7 +101,7 @@ int unit_walktoxy_sub(struct block_list *bl) return 1; } -static int unit_walktoxy_timer(int tid,unsigned int tick,int id,int data) +static int unit_walktoxy_timer(int tid, unsigned int tick, int id, intptr data) { int i; int x,y,dx,dy; @@ -254,13 +254,13 @@ static int unit_walktoxy_timer(int tid,unsigned int tick,int id,int data) return 0; } -static int unit_delay_walktoxy_timer(int tid, unsigned int tick, int id, int data) +static int unit_delay_walktoxy_timer(int tid, unsigned int tick, int id, intptr data) { struct block_list *bl = map_id2bl(id); if (!bl || bl->prev == NULL) return 0; - unit_walktoxy(bl, data>>16, data&0xffff, 0); + unit_walktoxy(bl, (short)((data>>16)&0xffff), (short)(data&0xffff), 0); return 1; } @@ -318,7 +318,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,int data) +static int unit_walktobl_sub(int tid, unsigned int tick, int id, intptr data) { struct block_list *bl = map_id2bl(id); struct unit_data *ud = bl?unit_bl2ud(bl):NULL; @@ -762,7 +762,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,int data) +int unit_resume_running(int tid, unsigned int tick, int id, intptr data) { struct unit_data *ud = (struct unit_data *)data; @@ -1192,7 +1192,7 @@ int unit_skilluse_pos2( struct block_list *src, short skill_x, short skill_y, sh return 1; } -static int unit_attack_timer(int tid,unsigned int tick,int id,int data); +static int unit_attack_timer(int tid, unsigned int tick, int id, intptr data); int unit_stop_attack(struct block_list *bl) { @@ -1476,7 +1476,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,int data) +static int unit_attack_timer(int tid, unsigned int tick, int id, intptr data) { struct block_list *bl; bl = map_id2bl(id); |