diff options
| author | Bertram <yohanndotferreiraatorange.fr> | 2010-03-08 10:59:06 +0100 |
|---|---|---|
| committer | Bertram <yohanndotferreiraatorange.fr> | 2010-03-08 10:59:06 +0100 |
| commit | 71cefdb345652342a3eaf84f197586809128e6ab (patch) | |
| tree | ee005153907e75a9f03c2ece12683a5294ff5ecb /src/resources/mapreader.cpp | |
| parent | da77a5f25dbf9cdfbb33ddae1c01ed961f41374f (diff) | |
| parent | 5ba23a83501dc267a0adbd17d0ae23def3acf089 (diff) | |
| download | mana-client-71cefdb345652342a3eaf84f197586809128e6ab.tar.gz mana-client-71cefdb345652342a3eaf84f197586809128e6ab.tar.bz2 mana-client-71cefdb345652342a3eaf84f197586809128e6ab.tar.xz mana-client-71cefdb345652342a3eaf84f197586809128e6ab.zip | |
Merge branch 'master' of gitorious.org:mana/mana
Diffstat (limited to 'src/resources/mapreader.cpp')
| -rw-r--r-- | src/resources/mapreader.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/resources/mapreader.cpp b/src/resources/mapreader.cpp index d8678362..0f7ad749 100644 --- a/src/resources/mapreader.cpp +++ b/src/resources/mapreader.cpp @@ -21,6 +21,7 @@ #include "resources/mapreader.h" +#include "configuration.h" #include "log.h" #include "map.h" #include "tileset.h" @@ -291,8 +292,12 @@ Map *MapReader::readMap(xmlNodePtr node, const std::string &path) } else if (objType == "WARP") { - map->addParticleEffect("graphics/particles/warparea.particle.xml", - objX, objY, objW, objH); + if (config.getValue("showWarps", 1)) + { + map->addParticleEffect( + "graphics/particles/warparea.particle.xml", + objX, objY, objW, objH); + } } else { |