diff options
| author | malufett <malufett.eat.my.binaries@gmail.com> | 2014-03-12 18:36:58 +0800 |
|---|---|---|
| committer | malufett <malufett.eat.my.binaries@gmail.com> | 2014-03-12 18:36:58 +0800 |
| commit | dc05ef11b1fbbccdd54eba54b93d3eba0b032970 (patch) | |
| tree | cd3aa233f83bc847c956164e112c97b2b57f51c9 /src/map/status.c | |
| parent | 2f9a514a7118724e2954ac96c67e7396ec61d0b4 (diff) | |
| parent | 571d9e25008d8b386e28d7f1fd02f2690edf1f8c (diff) | |
| download | hercules-dc05ef11b1fbbccdd54eba54b93d3eba0b032970.tar.gz hercules-dc05ef11b1fbbccdd54eba54b93d3eba0b032970.tar.bz2 hercules-dc05ef11b1fbbccdd54eba54b93d3eba0b032970.tar.xz hercules-dc05ef11b1fbbccdd54eba54b93d3eba0b032970.zip | |
Merge branch 'master' of https://github.com/HerculesWS/Hercules
Diffstat (limited to 'src/map/status.c')
| -rw-r--r-- | src/map/status.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/map/status.c b/src/map/status.c index 5dcf35198..4a81fcb05 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -1985,7 +1985,9 @@ unsigned short status_base_atk(const struct block_list *bl, const struct status_ return cap_value(str, 0, USHRT_MAX); } +#ifndef RENEWAL static inline unsigned short status_base_matk_min(const struct status_data *st){ return st->int_+(st->int_/7)*(st->int_/7); } +#endif // not RENEWAL static inline unsigned short status_base_matk_max(const struct status_data *st){ return st->int_+(st->int_/5)*(st->int_/5); } unsigned short status_base_matk(const struct status_data *st, int level) { @@ -9605,7 +9607,7 @@ int status_change_end_(struct block_list* bl, enum sc_type type, int tid, const if (sce->timer != tid && tid != INVALID_TIMER) return 0; - if( sd && sce->timer == INVALID_TIMER ) + if( sd && sce->timer == INVALID_TIMER && !sd->state.loggingout ) chrif->del_scdata_single(sd->status.account_id,sd->status.char_id,type); if (tid == INVALID_TIMER) { |