diff options
| author | Dastgir <dastgirpojee@rocketmail.com> | 2015-01-15 12:11:08 +0530 |
|---|---|---|
| committer | Dastgir <dastgirpojee@rocketmail.com> | 2015-01-15 12:11:08 +0530 |
| commit | 06166cac023cefa193926de5a47dd7bc11f298b3 (patch) | |
| tree | 3e235122b16652e9262736e82d0f0804680aae22 /src/map/skill.c | |
| parent | 9fbeb05aa054b5ed9641460d2639f30812edd957 (diff) | |
| parent | 3c032b6766ded92ef032862ff3b812cad0eacefd (diff) | |
| download | hercules-06166cac023cefa193926de5a47dd7bc11f298b3.tar.gz hercules-06166cac023cefa193926de5a47dd7bc11f298b3.tar.bz2 hercules-06166cac023cefa193926de5a47dd7bc11f298b3.tar.xz hercules-06166cac023cefa193926de5a47dd7bc11f298b3.zip | |
Merge branch 'master' of https://github.com/HerculesWS/Hercules
Diffstat (limited to 'src/map/skill.c')
| -rw-r--r-- | src/map/skill.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/map/skill.c b/src/map/skill.c index db675d7f4..53be5541c 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -3152,7 +3152,7 @@ int skill_area_sub_count(struct block_list *src, struct block_list *target, uint * *------------------------------------------*/ int skill_timerskill(int tid, int64 tick, int id, intptr_t data) { - struct block_list *src = map->id2bl(id),*target; + struct block_list *src = map->id2bl(id),*target = NULL; struct unit_data *ud = unit->bl2ud(src); struct skill_timerskill *skl; int range; @@ -3382,7 +3382,7 @@ int skill_timerskill(int tid, int64 tick, int id, intptr_t data) { skill->get_type(skl->skill_id),src,src,skl->skill_id,skl->skill_lv,tick,skl->flag,BCT_ENEMY); break; default: - skill->timerskill_notarget_unknown(tid, tick, src, target, ud, skl); + skill->timerskill_notarget_unknown(tid, tick, src, ud, skl); break; } } @@ -3402,7 +3402,7 @@ void skill_timerskill_target_unknown(int tid, int64 tick, struct block_list *src skill->attack(skl->type, src, src, target, skl->skill_id, skl->skill_lv, tick, skl->flag); } -void skill_timerskill_notarget_unknown(int tid, int64 tick, struct block_list *src, struct block_list *target, struct unit_data *ud, struct skill_timerskill *skl) +void skill_timerskill_notarget_unknown(int tid, int64 tick, struct block_list *src, struct unit_data *ud, struct skill_timerskill *skl) { } @@ -14552,9 +14552,9 @@ bool skill_get_requirement_off_unknown(struct status_change *sc, uint16 *skill_i return false; } -int skill_get_requirement_item_unknown(struct status_change *sc, struct map_session_data* sd, uint16 *skill_id, uint16 *skill_lv, uint16 *idx, int *i) +bool skill_get_requirement_item_unknown(struct status_change *sc, struct map_session_data* sd, uint16 *skill_id, uint16 *skill_lv, uint16 *idx, int *i) { - return -1; + return false; } void skill_get_requirement_unknown(struct status_change *sc, struct map_session_data* sd, uint16 *skill_id, uint16 *skill_lv, struct skill_condition *req) |