diff options
| author | Yohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer> | 2010-09-15 21:26:07 +0200 |
|---|---|---|
| committer | Yohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer> | 2010-09-15 21:26:07 +0200 |
| commit | fa901d1cb94cdd47cb066402ae7e478154113306 (patch) | |
| tree | 369e02549b3facf6aac2c9af3b995df07fa7581d /src/game-server/mapcomposite.cpp | |
| parent | a92a2f3255e9b7eabedb8eec7e25cd80e82481fb (diff) | |
| download | manaserv-fa901d1cb94cdd47cb066402ae7e478154113306.tar.gz manaserv-fa901d1cb94cdd47cb066402ae7e478154113306.tar.bz2 manaserv-fa901d1cb94cdd47cb066402ae7e478154113306.tar.xz manaserv-fa901d1cb94cdd47cb066402ae7e478154113306.zip | |
Reordered the manaserv.xml.example file and made related code cleanups.
Reviewed-by: Thorbjorn.
Diffstat (limited to 'src/game-server/mapcomposite.cpp')
| -rw-r--r-- | src/game-server/mapcomposite.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/game-server/mapcomposite.cpp b/src/game-server/mapcomposite.cpp index 4aca7efe..fa7a38c6 100644 --- a/src/game-server/mapcomposite.cpp +++ b/src/game-server/mapcomposite.cpp @@ -547,14 +547,14 @@ void MapComposite::setMap(Map *m) mMap = m; mContent = new MapContent(m); - std::string sPvP = m->getProperty ("pvp"); + 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; + sPvP = Configuration::getValue("game_defaultPvp", ""); + if (sPvP == "free") + mPvPRules = PVP_FREE; + else + mPvPRules = PVP_NONE; } void MapComposite::update() |