Fixed a bug in r11384 letting you bypass requirements for some skills (see bugreport:219).
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11710 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
parent
d093d95e9c
commit
ffd150e6f0
@ -3,6 +3,8 @@ Date Added
|
|||||||
AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK.
|
AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK.
|
||||||
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
|
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
|
||||||
|
|
||||||
|
2007/11/12
|
||||||
|
* Fixed a bug in r11384 letting you bypass requirements for some skills
|
||||||
2007/11/09
|
2007/11/09
|
||||||
* Expanded weapon_type enum with dual-wield constants (bugreport:384)
|
* Expanded weapon_type enum with dual-wield constants (bugreport:384)
|
||||||
* Replaced several 'int' variables with enums that they represent
|
* Replaced several 'int' variables with enums that they represent
|
||||||
|
@ -7801,17 +7801,6 @@ int skill_check_condition(struct map_session_data* sd, short skill, short lv, in
|
|||||||
if(!sc || sc->data[SC_COMBO].timer == -1 || sc->data[SC_COMBO].val1 != skill)
|
if(!sc || sc->data[SC_COMBO].timer == -1 || sc->data[SC_COMBO].val1 != skill)
|
||||||
return 0;
|
return 0;
|
||||||
break;
|
break;
|
||||||
case AM_BERSERKPITCHER:
|
|
||||||
case AM_POTIONPITCHER:
|
|
||||||
case CR_SLIMPITCHER:
|
|
||||||
case MG_STONECURSE:
|
|
||||||
case CR_CULTIVATION:
|
|
||||||
case SA_FLAMELAUNCHER:
|
|
||||||
case SA_FROSTWEAPON:
|
|
||||||
case SA_LIGHTNINGLOADER:
|
|
||||||
case SA_SEISMICWEAPON:
|
|
||||||
delitem_flag = 0;
|
|
||||||
break;
|
|
||||||
case SA_DELUGE:
|
case SA_DELUGE:
|
||||||
case SA_VOLCANO:
|
case SA_VOLCANO:
|
||||||
case SA_VIOLENTGALE:
|
case SA_VIOLENTGALE:
|
||||||
@ -8094,7 +8083,7 @@ int skill_check_condition(struct map_session_data* sd, short skill, short lv, in
|
|||||||
}
|
}
|
||||||
|
|
||||||
if(!(type&1))
|
if(!(type&1))
|
||||||
return 1;
|
return 1; // consumption only happens on cast-end
|
||||||
|
|
||||||
if( delitem_flag )
|
if( delitem_flag )
|
||||||
{
|
{
|
||||||
|
@ -1094,8 +1094,7 @@ int unit_skilluse_pos2( struct block_list *src, short skill_x, short skill_y, sh
|
|||||||
sc = NULL;
|
sc = NULL;
|
||||||
|
|
||||||
if(sd) {
|
if(sd) {
|
||||||
if (skillnotok(skill_num, sd) ||
|
if (skillnotok(skill_num, sd) || !skill_check_condition(sd, skill_num, skill_lv,0))
|
||||||
!skill_check_condition(sd, skill_num, skill_lv,0))
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user