diff options
| author | David Athay <ko2fan@gmail.com> | 2009-03-30 10:56:47 +0100 |
|---|---|---|
| committer | David Athay <ko2fan@gmail.com> | 2009-03-30 10:56:47 +0100 |
| commit | 67cc90165693e445c6b45b4e381148516237c09c (patch) | |
| tree | 684264c576e4812e36c6a3a6987d4b1167fc3c1c /src/game-server/mapcomposite.cpp | |
| parent | 59cdf04f88eb515fa349404992652ed004e9bb3e (diff) | |
| parent | 3a54fb903f9cc2cc47a852dab6569848d19c6dad (diff) | |
| download | manaserv-67cc90165693e445c6b45b4e381148516237c09c.tar.gz manaserv-67cc90165693e445c6b45b4e381148516237c09c.tar.bz2 manaserv-67cc90165693e445c6b45b4e381148516237c09c.tar.xz manaserv-67cc90165693e445c6b45b4e381148516237c09c.zip | |
Merge branch 'master' of git@gitorious.org:tmwserv/mainline
Diffstat (limited to 'src/game-server/mapcomposite.cpp')
| -rw-r--r-- | src/game-server/mapcomposite.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/game-server/mapcomposite.cpp b/src/game-server/mapcomposite.cpp index 137622d5..4994b901 100644 --- a/src/game-server/mapcomposite.cpp +++ b/src/game-server/mapcomposite.cpp @@ -23,6 +23,7 @@ #include <cassert> #include "point.h" +#include "common/configuration.hpp" #include "game-server/map.hpp" #include "game-server/mapcomposite.hpp" #include "game-server/character.hpp" @@ -539,6 +540,14 @@ void MapComposite::setMap(Map *m) assert(!mMap && m); mMap = m; mContent = new MapContent(m); + + std::string sPvP = m->getProperty ("pvp"); + if (sPvP == "") sPvP = Configuration::getValue("defaultPvp", ""); + + if (sPvP == "free") mPvPRules = PVP_FREE; + else if (sPvP == "none") mPvPRules = PVP_NONE; + else mPvPRules = PVP_NONE; + } void MapComposite::update() |