diff options
| author | panikon <panikon@zoho.com> | 2014-03-25 20:23:39 -0300 |
|---|---|---|
| committer | panikon <panikon@zoho.com> | 2014-03-25 20:23:39 -0300 |
| commit | 4b1cc23085b858364a332bdf03d634656778b1e6 (patch) | |
| tree | 3928d9a1852ea0a49b6d6826e6a4f2730067b6ed /src/map/skill.c | |
| parent | 70a33d30013ada46b208506ac4b5a0861f5d6abb (diff) | |
| download | hercules-4b1cc23085b858364a332bdf03d634656778b1e6.tar.gz hercules-4b1cc23085b858364a332bdf03d634656778b1e6.tar.bz2 hercules-4b1cc23085b858364a332bdf03d634656778b1e6.tar.xz hercules-4b1cc23085b858364a332bdf03d634656778b1e6.zip | |
Added new return values to make_new_char_sql
Added char_id to charlog
Corrected RE check in skill_magic_reflect (see commit c9310f3)
Diffstat (limited to 'src/map/skill.c')
| -rw-r--r-- | src/map/skill.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/map/skill.c b/src/map/skill.c index 0ed6f7780..612b205e9 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -2201,12 +2201,12 @@ int skill_attack(int attack_type, struct block_list* src, struct block_list *dsr **/ #if MAGIC_REFLECTION_TYPE - #if defined(DISABLE_RENEWAL) + #ifdef RENEWAL + if( dmg.dmg_lv != ATK_MISS ) //Wiz SL cancelled and consumed fragment + #else // issue:6415 in pre-renewal Kaite reflected the entire damage received // regardless of caster's equipament (Aegis 11.1) if( dmg.dmg_lv != ATK_MISS && type == 1 ) //Wiz SL cancelled and consumed fragment - #else - if( dmg.dmg_lv != ATK_MISS ) //Wiz SL cancelled and consumed fragment #endif { short s_ele = skill->get_ele(skill_id, skill_lv); |