diff options
| author | Jedzkie <jedzkie13@rocketmail.com> | 2015-12-23 16:02:13 +0800 |
|---|---|---|
| committer | Jedzkie <jedzkie13@rocketmail.com> | 2015-12-23 16:02:13 +0800 |
| commit | e9129d00278edc75a45a1d5d47345c9d9f2460c3 (patch) | |
| tree | 3ef0e959c65a3d40e731e26c5b2b170059f9a1ed /src/map/battle.c | |
| parent | 248f245f078ddba531cf771dcd42ad9e0bd0f7c7 (diff) | |
| download | hercules-e9129d00278edc75a45a1d5d47345c9d9f2460c3.tar.gz hercules-e9129d00278edc75a45a1d5d47345c9d9f2460c3.tar.bz2 hercules-e9129d00278edc75a45a1d5d47345c9d9f2460c3.tar.xz hercules-e9129d00278edc75a45a1d5d47345c9d9f2460c3.zip | |
Update:
- Rename BLUE_CRYST and PINK_CRYST to BLUE_CRYSTAL and PINK_CRYSTAL
- Rename FOOD_STOR to FOOD_STORAGE
- Rename TREAS01, TREAS40, TREAS41, TREAS49 to TREASURE_01, TREASURE_40, TREASURE_41, TREASURE_49
Diffstat (limited to 'src/map/battle.c')
| -rw-r--r-- | src/map/battle.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/map/battle.c b/src/map/battle.c index 88037b042..96289fcc8 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -3327,16 +3327,16 @@ int64 battle_calc_damage(struct block_list *src,struct block_list *bl,struct Dam * Calculates BG related damage adjustments. *------------------------------------------*/ // FIXME: flag is undocumented -int64 battle_calc_bg_damage(struct block_list *src, struct block_list *bl, int64 damage, int div_, uint16 skill_id, uint16 skill_lv, int flag) -{ - if( !damage ) +int64 battle_calc_bg_damage(struct block_list *src, struct block_list *bl, int64 damage, int div_, uint16 skill_id, uint16 skill_lv, int flag) { + + if (!damage) return 0; nullpo_retr(damage, bl); - if( bl->type == BL_MOB ) { + if (bl->type == BL_MOB) { struct mob_data* md = BL_CAST(BL_MOB, bl); - if( flag&BF_SKILL && (md->class_ == MOBID_BLUE_CRYST || md->class_ == MOBID_PINK_CRYST) ) + if (flag&BF_SKILL && (md->class_ == MOBID_BLUE_CRYSTAL || md->class_ == MOBID_PINK_CRYSTAL)) return 0; // Crystal cannot receive skill damage on battlegrounds } |