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/skill.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/skill.c')
| -rw-r--r-- | src/map/skill.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/map/skill.c b/src/map/skill.c index 6ede18445..ce842e734 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -2020,7 +2020,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, int data) +static int skill_timerskill(int tid, unsigned int tick, int id, intptr data) { struct block_list *src = map_id2bl(id),*target; struct unit_data *ud = unit_bl2ud(src); @@ -5196,7 +5196,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, int data) +int skill_castend_id(int tid, unsigned int tick, int id, intptr data) { struct block_list *target, *src = map_id2bl(id); struct map_session_data* sd = NULL; @@ -5422,7 +5422,7 @@ int skill_castend_id (int tid, unsigned int tick, int id, int data) /*========================================== * *------------------------------------------*/ -int skill_castend_pos (int tid, unsigned int tick, int id, int data) +int skill_castend_pos(int tid, unsigned int tick, int id, intptr data) { struct block_list* src = map_id2bl(id); int maxcount; @@ -9703,7 +9703,7 @@ int skill_unit_timer_sub (struct block_list* bl, va_list ap) /*========================================== * Executes on all skill units every SKILLUNITTIMER_INTERVAL miliseconds. *------------------------------------------*/ -int skill_unit_timer (int tid, unsigned int tick, int id, int data) +int skill_unit_timer(int tid, unsigned int tick, int id, intptr data) { map_freeblock_lock(); @@ -10371,7 +10371,7 @@ int skill_arrow_create (struct map_session_data *sd, int nameid) /*========================================== * *------------------------------------------*/ -int skill_blockpc_end (int tid, unsigned int tick, int id, int data) +int skill_blockpc_end(int tid, unsigned int tick, int id, intptr data) { struct map_session_data *sd = map_id2sd(id); if (data <= 0 || data >= MAX_SKILL) @@ -10398,7 +10398,7 @@ int skill_blockpc_start(struct map_session_data *sd, int skillid, int tick) return add_timer(gettick()+tick,skill_blockpc_end,sd->bl.id,skillid); } -int skill_blockmerc_end (int tid, unsigned int tick, int id, int data) //[orn] +int skill_blockmerc_end(int tid, unsigned int tick, int id, intptr data) //[orn] { struct homun_data *hd = (TBL_HOM*) map_id2bl(id); if (data <= 0 || data >= MAX_SKILL) |