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/npc.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/npc.cpp')
| -rw-r--r-- | src/map/npc.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/map/npc.cpp b/src/map/npc.cpp index a939c74..43926e0 100644 --- a/src/map/npc.cpp +++ b/src/map/npc.cpp @@ -1532,8 +1532,8 @@ int npc_parse_mapflag(XString w1, XString, XString w3, ZString w4) if (battle_config.pk_mode && mf == MapFlag::NOPVP) { - m->flag.nopvp = 1; - m->flag.pvp = 0; + m->flag.set(MapFlag::NOPVP, 1); + m->flag.set(MapFlag::PVP, 0); return 0; } |