diff options
| author | Haruna <haru@dotalux.com> | 2014-01-16 17:21:39 -0800 |
|---|---|---|
| committer | Haruna <haru@dotalux.com> | 2014-01-16 17:21:39 -0800 |
| commit | e9affc57d6a03e0cc860f8364c8a349e22906b4a (patch) | |
| tree | cc85d2c1109ce7385bee4c211af5027ae591ebab /src/map/battle.c | |
| parent | 4874a3cf8b107457b703d0ece8d5102b08ef7702 (diff) | |
| parent | 0267cad28133b4c245f1cf100a24ab8a14cf2a73 (diff) | |
| download | hercules-e9affc57d6a03e0cc860f8364c8a349e22906b4a.tar.gz hercules-e9affc57d6a03e0cc860f8364c8a349e22906b4a.tar.bz2 hercules-e9affc57d6a03e0cc860f8364c8a349e22906b4a.tar.xz hercules-e9affc57d6a03e0cc860f8364c8a349e22906b4a.zip | |
Merge pull request #251 from panikon/master
Function types behaviour
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 1759bea05..fd31f5a1f 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -5747,21 +5747,21 @@ enum damage_lv battle_weapon_attack(struct block_list* src, struct block_list* t #undef GET_NORMAL_ATTACK #undef GET_NORMAL_ATTACK2 -int battle_check_undead(int race,int element) +bool battle_check_undead(int race,int element) { if(battle_config.undead_detect_type == 0) { if(element == ELE_UNDEAD) - return 1; + return true; } else if(battle_config.undead_detect_type == 1) { if(race == RC_UNDEAD) - return 1; + return true; } else { if(element == ELE_UNDEAD || race == RC_UNDEAD) - return 1; + return true; } - return 0; + return false; } //Returns the upmost level master starting with the given object |