diff options
| author | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-01-14 08:54:54 +0000 |
|---|---|---|
| committer | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-01-14 08:54:54 +0000 |
| commit | c59ea57a893908f54d2960a1e18d2473a1bb8196 (patch) | |
| tree | ffd267754c4bc8b70d559e9e416f326c82757ecb /src/map/status.c | |
| parent | dde2e2fa9619a504765b676caa3ac0b05b67cfbc (diff) | |
| download | hercules-c59ea57a893908f54d2960a1e18d2473a1bb8196.tar.gz hercules-c59ea57a893908f54d2960a1e18d2473a1bb8196.tar.bz2 hercules-c59ea57a893908f54d2960a1e18d2473a1bb8196.tar.xz hercules-c59ea57a893908f54d2960a1e18d2473a1bb8196.zip | |
Simplified the BL_CAST macro (see topic:166795)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12072 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/status.c')
| -rw-r--r-- | src/map/status.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/map/status.c b/src/map/status.c index 655944555..1176bd219 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -2520,7 +2520,7 @@ void status_calc_regen(struct block_list *bl, struct status_data *status, struct if (!(bl->type&BL_REGEN) || !regen) return; - BL_CAST(BL_PC,bl,sd); + sd = BL_CAST(BL_PC,bl); val = 1 + (status->vit/5) + (status->max_hp/200); @@ -2957,7 +2957,7 @@ void status_calc_bl(struct block_list *bl, unsigned long flag) if (!b_status || !status) return; - BL_CAST(BL_PC,bl,sd); + sd = BL_CAST(BL_PC,bl); if(sd && flag&SCB_PC) { //Recalc everything. @@ -4446,7 +4446,7 @@ int status_get_sc_def(struct block_list *bl, enum sc_type type, int rate, int ti return 0; } - BL_CAST(BL_PC,bl,sd); + sd = BL_CAST(BL_PC,bl); status = status_get_status_data(bl); switch (type) { @@ -4612,7 +4612,7 @@ int status_change_start(struct block_list* bl,enum sc_type type,int rate,int val return 0; //Emperium can't be afflicted by status changes } - BL_CAST(BL_PC, bl, sd); + sd = BL_CAST(BL_PC, bl); if(sd && sd->state.waitingdisconnect) return 0; //Character logging out, all his SC were wiped already! @@ -6220,7 +6220,7 @@ int status_change_end(struct block_list* bl, enum sc_type type, int tid) if(type < 0 || type >= SC_MAX || !sc || !(sce = sc->data[type])) return 0; - BL_CAST(BL_PC,bl,sd); + sd = BL_CAST(BL_PC,bl); if (sce->timer != tid && tid != -1) return 0; @@ -6696,7 +6696,7 @@ int status_change_timer(int tid, unsigned int tick, int id, int data) return 0; } - BL_CAST(BL_PC, bl, sd); + sd = BL_CAST(BL_PC, bl); // set the next timer of the sce (don't assume the status still exists) #define sc_timer_next(t,f,i,d) \ @@ -7020,8 +7020,8 @@ int status_change_timer_sub(struct block_list* bl, va_list ap) tsc = status_get_sc(bl); - BL_CAST(BL_PC, src, sd); - BL_CAST(BL_PC, bl, tsd); + sd = BL_CAST(BL_PC, src); + tsd = BL_CAST(BL_PC, bl); switch( type ) { @@ -7172,7 +7172,7 @@ static int status_natural_heal(DBKey key,void * data,va_list ap) sc = status_get_sc(bl); if (sc && !sc->count) sc = NULL; - BL_CAST(BL_PC,bl,sd); + sd = BL_CAST(BL_PC,bl); flag = regen->flag; if (flag&RGN_HP && (status->hp >= status->max_hp || regen->state.block&1)) |