From f4063c0d58d1a1812e24269efa1ebb8f9a7a2f2e Mon Sep 17 00:00:00 2001 From: Ben Longbons Date: Wed, 19 Feb 2014 23:22:10 -0800 Subject: Make mapflags bitmask instead of bitfield --- src/map/mob.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/map/mob.cpp') diff --git a/src/map/mob.cpp b/src/map/mob.cpp index 2a06cf7..c67dbc4 100644 --- a/src/map/mob.cpp +++ b/src/map/mob.cpp @@ -788,7 +788,7 @@ int mob_attack(dumb_ptr md, tick_t tick) // If you are reading this, please note: // it is highly platform-specific that this even works at all. int radius = battle_config.mob_splash_radius; - if (radius >= 0 && tbl->bl_type == BL::PC && !tbl->bl_m->flag.town) + if (radius >= 0 && tbl->bl_type == BL::PC && !tbl->bl_m->flag.get(MapFlag::TOWN)) map_foreachinarea(std::bind(mob_ancillary_attack, ph::_1, md, tbl, tick), tbl->bl_m, tbl->bl_x - radius, tbl->bl_y - radius, @@ -2747,7 +2747,7 @@ int mob_warp(dumb_ptr md, map_local *m, int x, int y, BeingRemoveWhy t if (type != BeingRemoveWhy::NEGATIVE1) { - if (md->bl_m->flag.monster_noteleport) + if (md->bl_m->flag.get(MapFlag::MONSTER_NOTELEPORT)) return 0; clif_clearchar(md, type); } @@ -3272,7 +3272,7 @@ int mobskill_use(dumb_ptr md, tick_t tick, flag = (md->hp < max_hp * msii.cond2i / 100); break; case MobSkillCondition::MSC_NOTINTOWN: // Only outside of towns. - flag = !md->bl_m->flag.town; + flag = !md->bl_m->flag.get(MapFlag::TOWN); break; case MobSkillCondition::MSC_SLAVELT: // slave < num flag = (mob_countslave(md) < msii.cond2i); -- cgit v1.2.3-70-g09d2