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/battle.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/battle.cpp')
| -rw-r--r-- | src/map/battle.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/map/battle.cpp b/src/map/battle.cpp index d1e79ef..3830c0f 100644 --- a/src/map/battle.cpp +++ b/src/map/battle.cpp @@ -2236,12 +2236,12 @@ int battle_check_target(dumb_ptr<block_list> src, dumb_ptr<block_list> target, if (ss->bl_type == BL::PC && target->bl_type == BL::PC) { // 両方PVPモードなら否定（敵） - if (ss->bl_m->flag.pvp + if (ss->bl_m->flag.get(MapFlag::PVP) || pc_iskiller(ss->is_player(), target->is_player())) { // [MouseJstr] if (battle_config.pk_mode) return 1; // prevent novice engagement in pk_mode [Valaris] - else if (ss->bl_m->flag.pvp_noparty && s_p > 0 && t_p > 0 + else if (ss->bl_m->flag.get(MapFlag::PVP_NOPARTY) && s_p > 0 && t_p > 0 && s_p == t_p) return 1; return 0; |