diff options
| author | markzd <markzd@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-12-30 19:07:02 +0000 |
|---|---|---|
| committer | markzd <markzd@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-12-30 19:07:02 +0000 |
| commit | f7a4bfbba6b5a247fcf76d5b10fdd80fd1a32e5e (patch) | |
| tree | 5d41fd36f550a161b764923f82484587032f5466 /src/map/skill.c | |
| parent | e81fad940ac591a6a76ecd0aa0b1d26cff688705 (diff) | |
| download | hercules-f7a4bfbba6b5a247fcf76d5b10fdd80fd1a32e5e.tar.gz hercules-f7a4bfbba6b5a247fcf76d5b10fdd80fd1a32e5e.tar.bz2 hercules-f7a4bfbba6b5a247fcf76d5b10fdd80fd1a32e5e.tar.xz hercules-f7a4bfbba6b5a247fcf76d5b10fdd80fd1a32e5e.zip | |
* Follow up r17065
Fixed some error when creating vars and some warnings.(bugreport:7074)
* Removed an undisered warning on script's sscanf. (bugreport:7059)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17066 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/skill.c')
| -rw-r--r-- | src/map/skill.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/map/skill.c b/src/map/skill.c index 069485b5f..c5303578d 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -16914,10 +16914,10 @@ int skill_blockpc_start_(struct map_session_data *sd, uint16 skill_id, int tick, { int oskill_id = skill_id; struct skill_cd* cd = NULL; + uint16 idx = skill_get_index(skill_id); nullpo_retr (-1, sd); - uint16 idx = skill_get_index(skill_id); if (idx == 0) return -1; @@ -16960,9 +16960,10 @@ int skill_blockhomun_end(int tid, unsigned int tick, int id, intptr_t data) //[o int skill_blockhomun_start(struct homun_data *hd, uint16 skill_id, int tick) //[orn] { + uint16 idx = skill_get_index(skill_id); nullpo_retr (-1, hd); - uint16 idx = skill_get_index(skill_id); + if (idx == 0) return -1; @@ -16986,9 +16987,9 @@ int skill_blockmerc_end(int tid, unsigned int tick, int id, intptr_t data) //[or int skill_blockmerc_start(struct mercenary_data *md, uint16 skill_id, int tick) { + uint16 idx = skill_get_index(skill_id); nullpo_retr (-1, md); - uint16 idx = skill_get_index(skill_id); if (idx == 0) return -1; if( tick < 1 ) |