diff options
| author | Paradox924X <Paradox924X@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2010-10-09 01:57:04 +0000 |
|---|---|---|
| committer | Paradox924X <Paradox924X@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2010-10-09 01:57:04 +0000 |
| commit | 46afaed6555abf5cfdb979e7b1e0b3a619ee36ae (patch) | |
| tree | 825b8e97cad9ee3c416d327c1e5f54b1ba1204d3 /src/map/battle.c | |
| parent | 5ab81c08011abb8af9a1001e7835c72c6de96142 (diff) | |
| download | hercules-46afaed6555abf5cfdb979e7b1e0b3a619ee36ae.tar.gz hercules-46afaed6555abf5cfdb979e7b1e0b3a619ee36ae.tar.bz2 hercules-46afaed6555abf5cfdb979e7b1e0b3a619ee36ae.tar.xz hercules-46afaed6555abf5cfdb979e7b1e0b3a619ee36ae.zip | |
Replaced all nullpo_retr() calls which returned 0 with nullpo_ret() calls.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14414 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/battle.c')
| -rw-r--r-- | src/map/battle.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/map/battle.c b/src/map/battle.c index c5a1f4272..2a7b4de18 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -179,8 +179,8 @@ int battle_delay_damage (unsigned int tick, int amotion, struct block_list *src, { struct delay_damage *dat; struct status_change *sc; - nullpo_retr(0, src); - nullpo_retr(0, target); + nullpo_ret(src); + nullpo_ret(target); sc = status_get_sc(target); if( sc && sc->data[SC_DEVOTION] && damage > 0 ) @@ -278,7 +278,7 @@ int battle_calc_damage(struct block_list *src,struct block_list *bl,struct Damag struct status_change_entry *sce; int div_ = d->div_, flag = d->flag; - nullpo_retr(0, bl); + nullpo_ret(bl); if( !damage ) return 0; @@ -713,7 +713,7 @@ int battle_addmastery(struct map_session_data *sd,struct block_list *target,int int weapon; damage = dmg; - nullpo_retr(0, sd); + nullpo_ret(sd); if((skill = pc_checkskill(sd,AL_DEMONBANE)) > 0 && target->type == BL_MOB && //This bonus doesnt work against players. @@ -3331,8 +3331,8 @@ int battle_check_target( struct block_list *src, struct block_list *target,int f int strip_enemy = 1; //Flag which marks whether to remove the BCT_ENEMY status if it's also friend/ally. struct block_list *s_bl = src, *t_bl = target; - nullpo_retr(0, src); - nullpo_retr(0, target); + nullpo_ret(src); + nullpo_ret(target); m = target->m; |