diff options
Diffstat (limited to 'src/map/pc.c')
| -rw-r--r-- | src/map/pc.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/map/pc.c b/src/map/pc.c index 372c45cb0..ded499f2d 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -85,7 +85,7 @@ int pc_isGM(struct map_session_data* sd) return sd->gmlevel; } -static int pc_invincible_timer(int tid, unsigned int tick, int id, intptr data) +static int pc_invincible_timer(int tid, unsigned int tick, int id, intptr_t data) { struct map_session_data *sd; @@ -123,7 +123,7 @@ void pc_delinvincibletimer(struct map_session_data* sd) } } -static int pc_spiritball_timer(int tid, unsigned int tick, int id, intptr data) +static int pc_spiritball_timer(int tid, unsigned int tick, int id, intptr_t data) { struct map_session_data *sd; int i; @@ -295,7 +295,7 @@ int pc_setrestartvalue(struct map_session_data *sd,int type) /*========================================== Rental System *------------------------------------------*/ -static int pc_inventory_rental_end(int tid, unsigned int tick, int id, intptr data) +static int pc_inventory_rental_end(int tid, unsigned int tick, int id, intptr_t data) { struct map_session_data *sd = map_id2sd(id); if( sd == NULL ) @@ -1722,14 +1722,14 @@ int pc_exeautobonus(struct map_session_data *sd,struct s_autobonus *autobonus) script_run_autobonus(autobonus->other_script,sd->bl.id,sd->equip_index[j]); } - autobonus->active = add_timer(gettick()+autobonus->duration, pc_endautobonus, sd->bl.id, (intptr)autobonus); + autobonus->active = add_timer(gettick()+autobonus->duration, pc_endautobonus, sd->bl.id, (intptr_t)autobonus); sd->state.autobonus |= autobonus->pos; status_calc_pc(sd,0); return 0; } -int pc_endautobonus(int tid, unsigned int tick, int id, intptr data) +int pc_endautobonus(int tid, unsigned int tick, int id, intptr_t data) { struct map_session_data *sd = map_id2sd(id); struct s_autobonus *autobonus = (struct s_autobonus *)data; @@ -4783,7 +4783,7 @@ const char* job_name(int class_) } } -int pc_follow_timer(int tid, unsigned int tick, int id, intptr data) +int pc_follow_timer(int tid, unsigned int tick, int id, intptr_t data) { struct map_session_data *sd; struct block_list *tbl; @@ -5665,7 +5665,7 @@ void pc_respawn(struct map_session_data* sd, clr_type clrtype) clif_resurrection(&sd->bl, 1); //If warping fails, send a normal stand up packet. } -static int pc_respawn_timer(int tid, unsigned int tick, int id, intptr data) +static int pc_respawn_timer(int tid, unsigned int tick, int id, intptr_t data) { struct map_session_data *sd = map_id2sd(id); if( sd != NULL ) @@ -7028,7 +7028,7 @@ int pc_setregistry_str(struct map_session_data *sd,const char *reg,const char *v /*========================================== * イベントタイマ??理 *------------------------------------------*/ -static int pc_eventtimer(int tid, unsigned int tick, int id, intptr data) +static int pc_eventtimer(int tid, unsigned int tick, int id, intptr_t data) { struct map_session_data *sd=map_id2sd(id); char *p = (char *)data; @@ -7062,7 +7062,7 @@ int pc_addeventtimer(struct map_session_data *sd,int tick,const char *name) if( i == MAX_EVENTTIMER ) return 0; - sd->eventtimer[i] = add_timer(gettick()+tick, pc_eventtimer, sd->bl.id, (intptr)aStrdup(name)); + sd->eventtimer[i] = add_timer(gettick()+tick, pc_eventtimer, sd->bl.id, (intptr_t)aStrdup(name)); sd->eventcount++; return 1; @@ -7528,7 +7528,7 @@ int pc_calc_pvprank(struct map_session_data *sd) /*========================================== * PVP順位計算(timer) *------------------------------------------*/ -int pc_calc_pvprank_timer(int tid, unsigned int tick, int id, intptr data) +int pc_calc_pvprank_timer(int tid, unsigned int tick, int id, intptr_t data) { struct map_session_data *sd=NULL; @@ -7727,7 +7727,7 @@ int pc_setsavepoint(struct map_session_data *sd, short mapindex,int x,int y) /*========================================== * 自動セ?ブ (timer??) *------------------------------------------*/ -int pc_autosave(int tid, unsigned int tick, int id, intptr data) +int pc_autosave(int tid, unsigned int tick, int id, intptr_t data) { int interval; struct s_mapiterator* iter; @@ -7781,7 +7781,7 @@ static int pc_daynight_timer_sub(struct map_session_data *sd,va_list ap) * timer to do the day [Yor] * data: 0 = called by timer, 1 = gmcommand/script *------------------------------------------------*/ -int map_day_timer(int tid, unsigned int tick, int id, intptr data) +int map_day_timer(int tid, unsigned int tick, int id, intptr_t data) { char tmp_soutput[1024]; @@ -7802,7 +7802,7 @@ int map_day_timer(int tid, unsigned int tick, int id, intptr data) * timer to do the night [Yor] * data: 0 = called by timer, 1 = gmcommand/script *------------------------------------------------*/ -int map_night_timer(int tid, unsigned int tick, int id, intptr data) +int map_night_timer(int tid, unsigned int tick, int id, intptr_t data) { char tmp_soutput[1024]; |