From 145df89a504427fb4f8c69c0eb155ec4f0fc5841 Mon Sep 17 00:00:00 2001 From: shennetsind Date: Thu, 22 Mar 2012 06:37:36 +0000 Subject: 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 --- src/map/unit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/map/unit.c') 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 -- cgit v1.2.3-70-g09d2