diff options
| author | Haruna <haru@dotalux.com> | 2015-07-15 14:08:59 +0200 |
|---|---|---|
| committer | Haruna <haru@dotalux.com> | 2015-07-15 14:08:59 +0200 |
| commit | 9a2f6e96f54ed1c3931bc441ed31da51bf785fdb (patch) | |
| tree | deb6150d689b5f4bc0e8fe0e241183d2f6ac1cdc /src/map/battle.c | |
| parent | ebfc9c3f8d740414b13fff86bad44d077d7ae81e (diff) | |
| parent | 245cab6b53ef3062608546a6fdb79af23f4e9780 (diff) | |
| download | hercules-9a2f6e96f54ed1c3931bc441ed31da51bf785fdb.tar.gz hercules-9a2f6e96f54ed1c3931bc441ed31da51bf785fdb.tar.bz2 hercules-9a2f6e96f54ed1c3931bc441ed31da51bf785fdb.tar.xz hercules-9a2f6e96f54ed1c3931bc441ed31da51bf785fdb.zip | |
Merge pull request #564 from 4144/checks
Add missing check to login and char server and remove useless checks from char and map servers
Diffstat (limited to 'src/map/battle.c')
| -rw-r--r-- | src/map/battle.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/map/battle.c b/src/map/battle.c index 8a834574b..3575dea6f 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -3627,7 +3627,7 @@ struct Damage battle_calc_magic_attack(struct block_list *src,struct block_list } } #ifndef HMAP_ZONE_DAMAGE_CAP_TYPE - if( target && skill_id ) { + if (skill_id) { for(i = 0; i < map->list[target->m].zone->capped_skills_count; i++) { if( skill_id == map->list[target->m].zone->capped_skills[i]->nameid && (map->list[target->m].zone->capped_skills[i]->type & target->type) ) { if( target->type == BL_MOB && map->list[target->m].zone->capped_skills[i]->subtype != MZS_NONE ) { @@ -4101,7 +4101,7 @@ struct Damage battle_calc_misc_attack(struct block_list *src,struct block_list * } } #ifndef HMAP_ZONE_DAMAGE_CAP_TYPE - if( target && skill_id ) { + if (skill_id) { for(i = 0; i < map->list[target->m].zone->capped_skills_count; i++) { if( skill_id == map->list[target->m].zone->capped_skills[i]->nameid && (map->list[target->m].zone->capped_skills[i]->type & target->type) ) { if( target->type == BL_MOB && map->list[target->m].zone->capped_skills[i]->subtype != MZS_NONE ) { @@ -5314,7 +5314,7 @@ struct Damage battle_calc_weapon_attack(struct block_list *src,struct block_list if(skill_id == CR_GRANDCROSS || skill_id == NPC_GRANDDARKNESS) return wd; //Enough, rest is not needed. #ifndef HMAP_ZONE_DAMAGE_CAP_TYPE - if( target && skill_id ) { + if (skill_id) { for(i = 0; i < map->list[target->m].zone->capped_skills_count; i++) { if( skill_id == map->list[target->m].zone->capped_skills[i]->nameid && (map->list[target->m].zone->capped_skills[i]->type & target->type) ) { if( target->type == BL_MOB && map->list[target->m].zone->capped_skills[i]->subtype != MZS_NONE ) { |