diff options
| author | Andrei Karas <akaras@inbox.ru> | 2019-04-01 22:10:49 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2019-05-06 01:23:08 +0300 |
| commit | e28cd1d53916ef1471da20abdf7c2d78e4e0f5a7 (patch) | |
| tree | 0d3dd408d73fbc810d6000884d2d2989328e7601 /src/map/status.c | |
| parent | 7cc71c4b4ecdbf32bbfda88bd0abfdcce1bdf5de (diff) | |
| download | hercules-e28cd1d53916ef1471da20abdf7c2d78e4e0f5a7.tar.gz hercules-e28cd1d53916ef1471da20abdf7c2d78e4e0f5a7.tar.bz2 hercules-e28cd1d53916ef1471da20abdf7c2d78e4e0f5a7.tar.xz hercules-e28cd1d53916ef1471da20abdf7c2d78e4e0f5a7.zip | |
Fix warnings after last changes
Diffstat (limited to 'src/map/status.c')
| -rw-r--r-- | src/map/status.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/src/map/status.c b/src/map/status.c index 4c5df639f..ec7a908a8 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -4537,13 +4537,17 @@ static unsigned int status_base_matk(struct block_list *bl, const struct status_ switch (bl->type) { case BL_MOB: matk = st->int_ + level; + break; case BL_HOM: matk = status_get_homint(st, BL_UCCAST(BL_HOM, bl)) + level; + break; case BL_MER: matk = st->int_ + st->int_ / 5 * st->int_ / 5; + break; case BL_PC: default: // temporary until all are formulated matk = st->int_ + (st->int_ / 2) + (st->dex / 5) + (st->luk / 3) + (level / 4); + break; } return cap_value(matk, battle_config.matk_min, battle_config.matk_max); #else @@ -8479,12 +8483,12 @@ static int status_change_start(struct block_list *src, struct block_list *bl, en val3 = 0; val4 = 0; max_stat = (status->get_lv(bl)-10<50)?status->get_lv(bl)-10:50; - stat = max(0, max_stat - status2->str ); val3 |= cap_value(stat,0,0xFF)<<16; - stat = max(0, max_stat - status2->agi ); val3 |= cap_value(stat,0,0xFF)<<8; - stat = max(0, max_stat - status2->vit ); val3 |= cap_value(stat,0,0xFF); - stat = max(0, max_stat - status2->int_); val4 |= cap_value(stat,0,0xFF)<<16; - stat = max(0, max_stat - status2->dex ); val4 |= cap_value(stat,0,0xFF)<<8; - stat = max(0, max_stat - status2->luk ); val4 |= cap_value(stat,0,0xFF); + stat = max(0, max_stat - (int)status2->str ); val3 |= cap_value(stat,0,0xFF)<<16; + stat = max(0, max_stat - (int)status2->agi ); val3 |= cap_value(stat,0,0xFF)<<8; + stat = max(0, max_stat - (int)status2->vit ); val3 |= cap_value(stat,0,0xFF); + stat = max(0, max_stat - (int)status2->int_); val4 |= cap_value(stat,0,0xFF)<<16; + stat = max(0, max_stat - (int)status2->dex ); val4 |= cap_value(stat,0,0xFF)<<8; + stat = max(0, max_stat - (int)status2->luk ); val4 |= cap_value(stat,0,0xFF); } break; case SC_SWORDREJECT: |