diff options
| author | Haruna <haru@dotalux.com> | 2015-01-12 21:02:53 +0100 |
|---|---|---|
| committer | Haruna <haru@dotalux.com> | 2015-01-12 21:02:53 +0100 |
| commit | 74f2ce544bcc8ad814e3512b67f508fe5df40c23 (patch) | |
| tree | f4c74dc5cc55711552aee5974fb3377ddb9aa433 /src/map | |
| parent | 6a5636ddf61e4fca9d258c11ebead182564f234f (diff) | |
| parent | b64d0a62182800bd1c827b142c490afd94d7ef46 (diff) | |
| download | hercules-74f2ce544bcc8ad814e3512b67f508fe5df40c23.tar.gz hercules-74f2ce544bcc8ad814e3512b67f508fe5df40c23.tar.bz2 hercules-74f2ce544bcc8ad814e3512b67f508fe5df40c23.tar.xz hercules-74f2ce544bcc8ad814e3512b67f508fe5df40c23.zip | |
Merge pull request #440 from 4144/uninitializedfixes
Different warnings fixes
Diffstat (limited to 'src/map')
| -rw-r--r-- | src/map/atcommand.c | 2 | ||||
| -rw-r--r-- | src/map/skill.c | 4 | ||||
| -rw-r--r-- | src/map/skill.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/map/atcommand.c b/src/map/atcommand.c index a78b644a9..56dd5784c 100644 --- a/src/map/atcommand.c +++ b/src/map/atcommand.c @@ -5979,7 +5979,7 @@ ACMD(mobsearch) clif->message(fd, atcmd_output); return false; } - if(mob_id == atoi(mob_name) && mob->db(mob_id)->jname) + if (mob_id == atoi(mob_name)) strcpy(mob_name,mob->db(mob_id)->jname); // --ja-- //strcpy(mob_name,mob_db(mob_id)->name); // --en-- diff --git a/src/map/skill.c b/src/map/skill.c index 28acb0b7f..53be5541c 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -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) { } diff --git a/src/map/skill.h b/src/map/skill.h index aadda32d9..31a268971 100644 --- a/src/map/skill.h +++ b/src/map/skill.h @@ -2055,7 +2055,7 @@ struct skill_interface { void (*attack_post_unknown) (int *attack_type, struct block_list* src, struct block_list *dsrc, struct block_list *bl, uint16 *skill_id, uint16 *skill_lv, int64 *tick, int *flag); bool (*timerskill_dead_unknown) (struct block_list *src, struct unit_data *ud, struct skill_timerskill *skl); void (*timerskill_target_unknown) (int tid, int64 tick, struct block_list *src, struct block_list *target, struct unit_data *ud, struct skill_timerskill *skl); - void (*timerskill_notarget_unknown) (int tid, int64 tick, struct block_list *src, struct block_list *target, struct unit_data *ud, struct skill_timerskill *skl); + void (*timerskill_notarget_unknown) (int tid, int64 tick, struct block_list *src, struct unit_data *ud, struct skill_timerskill *skl); bool (*cleartimerskill_exception) (int skill_id); bool (*castend_id_unknown) (struct unit_data *ud, struct block_list *src, struct block_list *target); bool (*castend_nodamage_id_dead_unknown) (struct block_list *src, struct block_list *bl, uint16 *skill_id, uint16 *skill_lv, int64 *tick, int *flag); |