diff options
| author | Ben Longbons <b.r.longbons@gmail.com> | 2014-02-19 23:22:10 -0800 |
|---|---|---|
| committer | Ben Longbons <b.r.longbons@gmail.com> | 2014-02-22 18:12:08 -0800 |
| commit | f4063c0d58d1a1812e24269efa1ebb8f9a7a2f2e (patch) | |
| tree | 6abe09a93f96e475c2714c10dfaef4df412bcf0c /src/map/magic-stmt.cpp | |
| parent | 8508f94daeeb49b6ccf3ee1a346f1dc9f9c56802 (diff) | |
| download | tmwa-f4063c0d58d1a1812e24269efa1ebb8f9a7a2f2e.tar.gz tmwa-f4063c0d58d1a1812e24269efa1ebb8f9a7a2f2e.tar.bz2 tmwa-f4063c0d58d1a1812e24269efa1ebb8f9a7a2f2e.tar.xz tmwa-f4063c0d58d1a1812e24269efa1ebb8f9a7a2f2e.zip | |
Make mapflags bitmask instead of bitfield
Diffstat (limited to 'src/map/magic-stmt.cpp')
| -rw-r--r-- | src/map/magic-stmt.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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 */ |