diff options
| author | shennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-03-22 06:37:36 +0000 |
|---|---|---|
| committer | shennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-03-22 06:37:36 +0000 |
| commit | 145df89a504427fb4f8c69c0eb155ec4f0fc5841 (patch) | |
| tree | e96a1298b1023fd2a0836cb5523c6230e952c096 /src/map/unit.c | |
| parent | 1fdd9051b6ae3a72d43bfb2f490710f9a7b2eaf0 (diff) | |
| download | hercules-145df89a504427fb4f8c69c0eb155ec4f0fc5841.tar.gz hercules-145df89a504427fb4f8c69c0eb155ec4f0fc5841.tar.bz2 hercules-145df89a504427fb4f8c69c0eb155ec4f0fc5841.tar.xz hercules-145df89a504427fb4f8c69c0eb155ec4f0fc5841.zip | |
Fixed the damn broken combo code. Fixed Fallen Empire and Dragon Combo (part of bugreport:5358) and applied some more of my curly brace love.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15758 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/unit.c')
| -rw-r--r-- | src/map/unit.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/map/unit.c b/src/map/unit.c index f6ef79e56..39480867d 100644 --- a/src/map/unit.c +++ b/src/map/unit.c @@ -1014,7 +1014,7 @@ int unit_skilluse_id2(struct block_list *src, int target_id, short skill_num, sh //temp: used to signal combo-skills right now. if (sc && sc->data[SC_COMBO] && (sc->data[SC_COMBO]->val1 == skill_num || - skill_num == MO_EXTREMITYFIST || skill_num == SR_DRAGONCOMBO )) { + (sd?skill_check_condition_castbegin(sd,skill_num,skill_lv):0) )) { if (sc->data[SC_COMBO]->val2) target_id = sc->data[SC_COMBO]->val2; else |