diff options
| author | Wushin <pasekei@gmail.com> | 2015-04-29 22:21:45 -0500 |
|---|---|---|
| committer | Wushin <pasekei@gmail.com> | 2015-04-29 22:21:45 -0500 |
| commit | ff87a3f275966dfcdd5a123b44b8802288ca6b22 (patch) | |
| tree | d9a40f2e5431c9ff3072c685807a26983f0d0c88 | |
| parent | bc5ae9b66a95ded0510ec4ac284d54b26d6dc14c (diff) | |
| parent | 0e10d43adcfd26e4d2d8379f03041d6ba7a809cf (diff) | |
| download | tmwa-ff87a3f275966dfcdd5a123b44b8802288ca6b22.tar.gz tmwa-ff87a3f275966dfcdd5a123b44b8802288ca6b22.tar.bz2 tmwa-ff87a3f275966dfcdd5a123b44b8802288ca6b22.tar.xz tmwa-ff87a3f275966dfcdd5a123b44b8802288ca6b22.zip | |
Merge pull request #56 from mekolat/pk-mode
Do not require pk_mode for NOPVP
| -rw-r--r-- | src/map/npc-parse.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/map/npc-parse.cpp b/src/map/npc-parse.cpp index 443a1e7..9c9a22c 100644 --- a/src/map/npc-parse.cpp +++ b/src/map/npc-parse.cpp @@ -339,7 +339,7 @@ bool npc_load_mapflag(ast::npc::MapFlag& mapflag) return false; } - if (battle_config.pk_mode && mf == MapFlag::NOPVP) + if (mf == MapFlag::NOPVP) { if (mapflag.vec_extra.data.size()) { |