Procházet zdrojové kódy

- Fixed ensembles skills.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11869 54d463be-8e91-2dee-dedb-b68131a5f0ec
skotlex před 17 roky
rodič
revize
11aaa56783
3 změnil soubory, kde provedl 4 přidání a 5 odebrání
  1. 1 0
      Changelog-Trunk.txt
  2. 1 1
      src/map/skill.c
  3. 2 4
      src/map/unit.c

+ 1 - 0
Changelog-Trunk.txt

@@ -4,6 +4,7 @@ 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.
 
 2007/12/07
+	* Fixed ensembles skills.
 	* removed the timer heap correction code when the timers overflow since
 	  Flavio points out that it is not needed.
 	* Modified a bit the changesex code so you get saved and quit before

+ 1 - 1
src/map/skill.c

@@ -7328,7 +7328,7 @@ static int skill_check_condition_char_sub (struct block_list *bl, va_list ap)
 						(tsd->weapontype1==W_MUSICAL || tsd->weapontype1==W_WHIP) &&
 						sd->status.party_id && tsd->status.party_id &&
 						sd->status.party_id == tsd->status.party_id &&
-						tsd->sc.data[SC_DANCING])
+						!tsd->sc.data[SC_DANCING])
 				{
 					p_sd[(*c)++]=tsd->bl.id;
 					return skilllv;

+ 2 - 4
src/map/unit.c

@@ -899,10 +899,8 @@ int unit_skilluse_id2(struct block_list *src, int target_id, short skill_num, sh
 		case BD_INTOABYSS:
 		case BD_SIEGFRIED:
 		case CG_MOONLIT:
-			if (battle_config.player_skill_partner_check &&
-				(!battle_config.gm_skilluncond || pc_isGM(sd) < battle_config.gm_skilluncond) &&
-				(skill_check_pc_partner(sd, skill_num, &skill_lv, 1, 0) < 1)
-			) {
+			if (skill_check_pc_partner(sd, skill_num, &skill_lv, 1, 0) < 1)
+			{
 				clif_skill_fail(sd,skill_num,0,0);
 				return 0;
 			}