diff options
| author | malufett <malufett.eat.my.binaries@gmail.com> | 2013-01-13 02:45:48 +0800 |
|---|---|---|
| committer | malufett <malufett.eat.my.binaries@gmail.com> | 2013-01-13 02:45:48 +0800 |
| commit | 2df91fde37030dba1c89f37038ad86c2cb512107 (patch) | |
| tree | d36338c8f2a9505ff555101178982ecb8aa0b97b | |
| parent | 8fa57f98e0368b50abc875018692d7af3675baff (diff) | |
| parent | 02efda2130b68359b65c54c546187d027c5fc3e9 (diff) | |
| download | hercules-2df91fde37030dba1c89f37038ad86c2cb512107.tar.gz hercules-2df91fde37030dba1c89f37038ad86c2cb512107.tar.bz2 hercules-2df91fde37030dba1c89f37038ad86c2cb512107.tar.xz hercules-2df91fde37030dba1c89f37038ad86c2cb512107.zip | |
Merge remote-tracking branch 'origin/rathena'
| -rw-r--r-- | src/map/clif.c | 2 | ||||
| -rw-r--r-- | src/map/skill.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/map/clif.c b/src/map/clif.c index 06c74a5f8..a47a98891 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -11057,7 +11057,7 @@ void clif_parse_Cooking(int fd,struct map_session_data *sd) { return; } if( skill_can_produce_mix(sd,nameid,sd->menuskill_val, amount) ) - skill_produce_mix(sd,sd->menuskill_id,nameid,0,0,0,amount); + skill_produce_mix(sd,0,nameid,0,0,0,amount); clif_menuskill_clear(sd); } diff --git a/src/map/skill.c b/src/map/skill.c index 757165107..8c21b7eba 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -13840,7 +13840,7 @@ int skill_vfcastfix (struct block_list *bl, double time, uint16 skill_id, uint16 if( sd && ( skill_lv = pc_checkskill(sd, WL_RADIUS) ) && skill_id >= WL_WHITEIMPRISON && skill_id <= WL_FREEZE_SP ) fixcast_r = max(fixcast_r, 5 + skill_lv * 5); // Fixed cast non percentage bonuses - if( sc->data[SC_MANDRAGORA] && (skill_id >= SM_BASH && skill_id <= RETURN_TO_ELDICASTES) ) + if( sc->data[SC_MANDRAGORA] ) fixed += sc->data[SC_MANDRAGORA]->val1 * 1000 / 2; if (sc->data[SC_IZAYOI] && (skill_id >= NJ_TOBIDOUGU && skill_id <= NJ_ISSEN)) fixed = 0; |