diff options
| author | Haru <haru@dotalux.com> | 2018-06-25 20:42:56 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-25 20:42:56 +0200 |
| commit | 13d0d8cfb5e37e1e4f1842c247844c3fc736c02f (patch) | |
| tree | 48cf0d0cb2e85413628e9616d5ddb28c13bf2c2b | |
| parent | 9694bd186896b75ba74f86e6d6c169d0ee97062c (diff) | |
| parent | 091f6a8f923552e2b9a7e789a4ba9b549e5816cd (diff) | |
| download | hercules-13d0d8cfb5e37e1e4f1842c247844c3fc736c02f.tar.gz hercules-13d0d8cfb5e37e1e4f1842c247844c3fc736c02f.tar.bz2 hercules-13d0d8cfb5e37e1e4f1842c247844c3fc736c02f.tar.xz hercules-13d0d8cfb5e37e1e4f1842c247844c3fc736c02f.zip | |
Merge pull request #2076 from dastgirp/3-skill_plugin
Plugin function ReturnType fix
| -rw-r--r-- | src/map/skill.c | 8 | ||||
| -rw-r--r-- | src/map/skill.h | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/map/skill.c b/src/map/skill.c index 6eacde897..34c36d7f3 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -15027,8 +15027,9 @@ int skill_check_condition_castend(struct map_session_data* sd, uint16 skill_id, } break; default: - skill->check_condition_castend_unknown(sd, &skill_id, &skill_lv); - break; + if (!skill->check_condition_castend_unknown(sd, &skill_id, &skill_lv)) + break; + return 0; } st = &sd->battle_status; @@ -15115,8 +15116,9 @@ int skill_check_condition_castend(struct map_session_data* sd, uint16 skill_id, return 1; } -void skill_check_condition_castend_unknown(struct map_session_data* sd, uint16 *skill_id, uint16 *skill_lv) +bool skill_check_condition_castend_unknown(struct map_session_data* sd, uint16 *skill_id, uint16 *skill_lv) { + return false; } // type&2: consume items (after skill was used) diff --git a/src/map/skill.h b/src/map/skill.h index e16094eae..bd1dc3344 100644 --- a/src/map/skill.h +++ b/src/map/skill.h @@ -2172,7 +2172,7 @@ struct skill_interface { int (*check_condition_castbegin_mount_unknown) (struct status_change *sc, uint16 *skill_id); int (*check_condition_castbegin_madogear_unknown) (struct status_change *sc, uint16 *skill_id); int (*check_condition_castbegin_unknown) (struct status_change *sc, uint16 *skill_id); - void (*check_condition_castend_unknown) (struct map_session_data* sd, uint16 *skill_id, uint16 *skill_lv); + bool (*check_condition_castend_unknown) (struct map_session_data* sd, uint16 *skill_id, uint16 *skill_lv); bool (*get_requirement_off_unknown) (struct status_change *sc, uint16 *skill_id); bool (*get_requirement_item_unknown) (struct status_change *sc, struct map_session_data* sd, uint16 *skill_id, uint16 *skill_lv, uint16 *idx, int *i); void (*get_requirement_unknown) (struct status_change *sc, struct map_session_data* sd, uint16 *skill_id, uint16 *skill_lv, struct skill_condition *req); |