diff options
| -rw-r--r-- | Changelog-Trunk.txt | 1 | ||||
| -rw-r--r-- | src/map/skill.c | 2 | ||||
| -rw-r--r-- | src/map/unit.c | 6 |
3 files changed, 4 insertions, 5 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 12fbf7100..742677b67 100644 --- a/Changelog-Trunk.txt +++ b/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 diff --git a/src/map/skill.c b/src/map/skill.c index 75a47782f..27a2882b3 100644 --- a/src/map/skill.c +++ b/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; diff --git a/src/map/unit.c b/src/map/unit.c index cda650a63..5603c1ff0 100644 --- a/src/map/unit.c +++ b/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; } |