diff options
| author | shennetsind <ind@henn.et> | 2014-03-22 17:07:13 -0300 |
|---|---|---|
| committer | shennetsind <ind@henn.et> | 2014-03-22 17:07:13 -0300 |
| commit | 2b4d6abbc5baddc2207e73f0b84c7e6c73e271a4 (patch) | |
| tree | e8d15f8f4a252cda88f3e3173f366ff9881edc4c /src/map/unit.c | |
| parent | 9ea7b143192568a259aa6e7e223420e8d5762b9e (diff) | |
| parent | d097f2c4b4a31885c6b04f5868563e1f48414192 (diff) | |
| download | hercules-2b4d6abbc5baddc2207e73f0b84c7e6c73e271a4.tar.gz hercules-2b4d6abbc5baddc2207e73f0b84c7e6c73e271a4.tar.bz2 hercules-2b4d6abbc5baddc2207e73f0b84c7e6c73e271a4.tar.xz hercules-2b4d6abbc5baddc2207e73f0b84c7e6c73e271a4.zip | |
Merge branch 'master' of https://github.com/HerculesWS/Hercules
Diffstat (limited to 'src/map/unit.c')
| -rw-r--r-- | src/map/unit.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/map/unit.c b/src/map/unit.c index 5dd63879f..39fff0eab 100644 --- a/src/map/unit.c +++ b/src/map/unit.c @@ -1092,8 +1092,12 @@ int unit_skilluse_id2(struct block_list *src, int target_id, uint16 skill_id, ui sc = NULL; //Unneeded //temp: used to signal combo-skills right now. - if (sc && sc->data[SC_COMBOATTACK] && (sc->data[SC_COMBOATTACK]->val1 == skill_id || - (sd?skill->check_condition_castbegin(sd,skill_id,skill_lv):0) )) { + if (sc && sc->data[SC_COMBOATTACK] + && skill->is_combo(skill_id) + && (sc->data[SC_COMBOATTACK]->val1 == skill_id + || ( sd?skill->check_condition_castbegin(sd,skill_id,skill_lv):0 ) + ) + ) { if (sc->data[SC_COMBOATTACK]->val2) target_id = sc->data[SC_COMBOATTACK]->val2; else |