diff options
| author | Milk <welcomerooot@gmail.com> | 2015-10-07 16:30:44 +0500 |
|---|---|---|
| committer | Milk <welcomerooot@gmail.com> | 2015-10-07 16:30:44 +0500 |
| commit | ca014e193703f71678a38be8b687637d45ac81f5 (patch) | |
| tree | 143e05d4d033f6f9cd96d7f157a39a5d5a79de71 /src/map/battle.c | |
| parent | f6abfb47831311a79bc448b2716a58b3d1f2853d (diff) | |
| download | hercules-ca014e193703f71678a38be8b687637d45ac81f5.tar.gz hercules-ca014e193703f71678a38be8b687637d45ac81f5.tar.bz2 hercules-ca014e193703f71678a38be8b687637d45ac81f5.tar.xz hercules-ca014e193703f71678a38be8b687637d45ac81f5.zip | |
Deleted dublicate
Diffstat (limited to 'src/map/battle.c')
| -rw-r--r-- | src/map/battle.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/map/battle.c b/src/map/battle.c index d7ffb4ca1..a511650a2 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -3003,12 +3003,11 @@ int64 battle_calc_damage(struct block_list *src,struct block_list *bl,struct Dam if(sc->data[SC_DEFENDER] && #ifdef RENEWAL ((flag&(BF_LONG|BF_WEAPON)) == (BF_LONG|BF_WEAPON) || skill_id == CR_ACIDDEMONSTRATION)) - damage = damage * ( 100 - sc->data[SC_DEFENDER]->val2 ) / 100; #else (flag&(BF_LONG|BF_WEAPON)) == (BF_LONG|BF_WEAPON)) // In pre-re Defender doesn't reduce damage from Acid Demonstration +#endif damage = damage * ( 100 - sc->data[SC_DEFENDER]->val2 ) / 100; -#endif - + #ifndef RENEWAL if(sc->data[SC_GS_ADJUSTMENT] && (flag&(BF_LONG|BF_WEAPON)) == (BF_LONG|BF_WEAPON)) |