- Combo-used Skills with State "move_enable" will now override the "can't move delay". Fixes Break-Fall -> Jump-Kick.

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7260 54d463be-8e91-2dee-dedb-b68131a5f0ec

2 files changed, 9 insertions, 2 deletions

diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index ddac38ee0..635d7892c 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -4,6 +4,8 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK.  ALL UNTESTED BUGFIXES/FEATURES GO
 IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.

 

 2006/06/19

+	* Combo-used Skills with State "move_enable" will now override the "can't

+	  move delay". Fixes Break-Fall -> Jump-Kick. [Skotlex]

 	* Some more cleanups of battle_calc_damage to account for absorbed damage

 	  reductions. [Skotlex]

 	* Moved back Soul Drain code from mob_dead to skill_counter_additional_effect.

diff --git a/src/map/skill.c b/src/map/skill.c
index 894dbf2fb..c316c6b74 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -8020,8 +8020,13 @@ int skill_check_condition (struct map_session_data *sd, int skill, int lv, int t
 		}
 		break;
 	case ST_MOVE_ENABLE:
-		//Check only on begin casting. [Skotlex]
-		if(!type && !unit_can_move(&sd->bl)) {
+		if(type)//Check only on begin casting. [Skotlex]
+			break;
+		
+		if (sc && sc->data[SC_COMBO].timer != -1 && sc->data[SC_COMBO].val1 == skill)
+			sd->ud.canmove_tick = gettick(); //When using a combo, cancel the can't move delay to enable the skill. [Skotlex]
+			
+		if (!unit_can_move(&sd->bl)) {
 			clif_skill_fail(sd,skill,0,0);
 			return 0;
 		}