diff options
| author | Andrei Karas <akaras@inbox.ru> | 2015-12-28 23:48:06 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2015-12-28 23:48:06 +0300 |
| commit | cb6e0f1b68ad76402f00968ea6ea65758daa8fbd (patch) | |
| tree | bbb13e6d59b0143817e559c9fb8f6a9656fe864e /src/map/status.c | |
| parent | 296e6c04a4c1a01a233c937bd198a31fa849f49c (diff) | |
| parent | f1afe0dfee7f97d46f6dad924f75d08956d17620 (diff) | |
| download | hercules-cb6e0f1b68ad76402f00968ea6ea65758daa8fbd.tar.gz hercules-cb6e0f1b68ad76402f00968ea6ea65758daa8fbd.tar.bz2 hercules-cb6e0f1b68ad76402f00968ea6ea65758daa8fbd.tar.xz hercules-cb6e0f1b68ad76402f00968ea6ea65758daa8fbd.zip | |
Merge pull request #955 from HerculesWS/src-id-constants
Replaced several numeric constants with enums
Diffstat (limited to 'src/map/status.c')
| -rw-r--r-- | src/map/status.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/map/status.c b/src/map/status.c index 32e5760a7..39329d5bb 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -2152,7 +2152,7 @@ int status_calc_mob_(struct mob_data* md, enum e_status_calc_opt opt) { if (!gc) ShowError("status_calc_mob: No castle set at map %s\n", map->list[md->bl.m].name); else - if(gc->castle_id < 24 || md->class_ == MOBID_EMPERIUM) { + if (gc->castle_id < 24 || md->class_ == MOBID_EMPELIUM) { #ifdef RENEWAL mstatus->max_hp += 50 * gc->defense; mstatus->max_sp += 70 * gc->defense; @@ -2165,7 +2165,7 @@ int status_calc_mob_(struct mob_data* md, enum e_status_calc_opt opt) { mstatus->def += (gc->defense+2)/3; mstatus->mdef += (gc->defense+2)/3; } - if(md->class_ != MOBID_EMPERIUM) { + if (md->class_ != MOBID_EMPELIUM) { mstatus->batk += mstatus->batk * 10*guardup_lv/100; mstatus->rhw.atk += mstatus->rhw.atk * 10*guardup_lv/100; mstatus->rhw.atk2 += mstatus->rhw.atk2 * 10*guardup_lv/100; @@ -7095,7 +7095,7 @@ int status_change_start(struct block_list *src, struct block_list *bl, enum sc_t if (bl->type == BL_MOB) { struct mob_data *md = BL_CAST(BL_MOB, bl); - if (md && (md->class_ == MOBID_EMPERIUM || mob_is_battleground(md)) && type != SC_SAFETYWALL && type != SC_PNEUMA) + if (md && (md->class_ == MOBID_EMPELIUM || mob_is_battleground(md)) && type != SC_SAFETYWALL && type != SC_PNEUMA) return 0; //Emperium/BG Monsters can't be afflicted by status changes #if 0 if (md && mob_is_gvg(md) && status->sc2scb_flag(type)&SCB_MAXHP) @@ -9317,7 +9317,7 @@ int status_change_start(struct block_list *src, struct block_list *bl, enum sc_t int max = val1*3; val3 = rnd()%(max-min)+min; val2 = val1; - val1 = 1002; // Monster ID + val1 = MOBID_PORING; } break; case SC_KAGEMUSYA: @@ -9432,8 +9432,8 @@ int status_change_start(struct block_list *src, struct block_list *bl, enum sc_t val2 = 30 * val1; break; case SC_MONSTER_TRANSFORM: - if( !mob->db_checkid(val1) ) - val1 = 1002; // default poring + if (!mob->db_checkid(val1)) + val1 = MOBID_PORING; break; case SC_ALL_RIDING: tick = -1; |