From f4063c0d58d1a1812e24269efa1ebb8f9a7a2f2e Mon Sep 17 00:00:00 2001
From: Ben Longbons <b.r.longbons@gmail.com>
Date: Wed, 19 Feb 2014 23:22:10 -0800
Subject: Make mapflags bitmask instead of bitfield

---
 src/map/magic-stmt.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/map/magic-stmt.cpp')

diff --git a/src/map/magic-stmt.cpp b/src/map/magic-stmt.cpp
index 945faa9..1905871 100644
--- a/src/map/magic-stmt.cpp
+++ b/src/map/magic-stmt.cpp
@@ -772,7 +772,7 @@ int op_injure(dumb_ptr<env_t> env, const_array<val_t> args)
     int mdef = battle_get_mdef(target);
 
     if (target->bl_type == BL::PC
-        && !target->bl_m->flag.pvp
+        && !target->bl_m->flag.get(MapFlag::PVP)
         && !target->is_player()->special_state.killable
         && (caster->bl_type != BL::PC || !caster->is_player()->special_state.killer))
         return 0;               /* Cannot damage other players outside of pvp */
@@ -1088,7 +1088,7 @@ void find_entities_in_area_c(dumb_ptr<block_list> target,
             if (filter == FOREACH_FILTER::PC
                 || filter == FOREACH_FILTER::ENTITY
                 || (filter == FOREACH_FILTER::TARGET
-                    && target->bl_m->flag.pvp))
+                    && target->bl_m->flag.get(MapFlag::PVP)))
                 break;
             else if (filter == FOREACH_FILTER::SPELL)
             {                   /* Check all spells bound to the caster */
-- 
cgit v1.2.3-70-g09d2