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/pc.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/pc.c')
-rw-r--r-- | src/map/pc.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/map/pc.c b/src/map/pc.c index be9b6bde2..29dfd1b30 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -115,7 +115,7 @@ int pc_set_gm_level(int account_id, int level) return 0; } -static int pc_invincible_timer(int tid,unsigned int tick,int id,int data) +static int pc_invincible_timer(int tid, unsigned int tick, int id, intptr data) { struct map_session_data *sd; @@ -153,7 +153,7 @@ void pc_delinvincibletimer(struct map_session_data* sd) } } -static int pc_spiritball_timer(int tid,unsigned int tick,int id,int data) +static int pc_spiritball_timer(int tid, unsigned int tick, int id, intptr data) { struct map_session_data *sd; @@ -4124,7 +4124,7 @@ char* job_name(int class_) } } -int pc_follow_timer(int tid,unsigned int tick,int id,int data) +int pc_follow_timer(int tid, unsigned int tick, int id, intptr data) { struct map_session_data *sd; struct block_list *tbl; @@ -4912,7 +4912,7 @@ void pc_respawn(struct map_session_data* sd, uint8 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,int data) +static int pc_respawn_timer(int tid, unsigned int tick, int id, intptr data) { struct map_session_data *sd = map_id2sd(id); if( sd != NULL ) @@ -6231,7 +6231,7 @@ int pc_setregistry_str(struct map_session_data *sd,char *reg,const char *val,int /*========================================== * イベントタイマ??理 *------------------------------------------*/ -static int pc_eventtimer(int tid,unsigned int tick,int id,int data) +static int pc_eventtimer(int tid, unsigned int tick, int id, intptr data) { struct map_session_data *sd=map_id2sd(id); char *p = (char *)data; @@ -6721,7 +6721,7 @@ int pc_calc_pvprank(struct map_session_data *sd) /*========================================== * PVP順位計算(timer) *------------------------------------------*/ -int pc_calc_pvprank_timer(int tid,unsigned int tick,int id,int data) +int pc_calc_pvprank_timer(int tid, unsigned int tick, int id, intptr data) { struct map_session_data *sd=NULL; @@ -6917,7 +6917,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,int data) +int pc_autosave(int tid, unsigned int tick, int id, intptr data) { int interval; struct s_mapiterator* iter; @@ -6985,7 +6985,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, int data) +int map_day_timer(int tid, unsigned int tick, int id, intptr data) { char tmp_soutput[1024]; @@ -7006,7 +7006,7 @@ int map_day_timer(int tid, unsigned int tick, int id, int 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, int data) +int map_night_timer(int tid, unsigned int tick, int id, intptr data) { char tmp_soutput[1024]; |