1 files changed, 20 insertions, 23 deletions

diff --git a/src/map.cpp b/src/map.cpp
index 928a0154..02b046fb 100644
--- a/src/map.cpp
+++ b/src/map.cpp
@@ -19,22 +19,21 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "map.h"
-
-#include <algorithm>
 #include <queue>
 
 #include "beingmanager.h"
 #include "configuration.h"
 #include "game.h"
 #include "graphics.h"
+#include "localplayer.h"
+#include "map.h"
 #include "particle.h"
 #include "sprite.h"
 #include "tileset.h"
 
-#include "resources/resourcemanager.h"
 #include "resources/ambientoverlay.h"
 #include "resources/image.h"
+#include "resources/resourcemanager.h"
 
 #include "utils/dtor.h"
 #include "utils/tostring.h"
@@ -111,6 +110,7 @@ void MapLayer::draw(Graphics *graphics,
         // If drawing the fringe layer, make sure all sprites above this row of
         // tiles have been drawn
         if (mIsFringeLayer) {
+            player_node->drawTargetCursor(graphics, scrollX, scrollY);
             while (si != sprites.end() && (*si)->getPixelY() <= y * 32 - 32) {
                 (*si)->draw(graphics, -scrollX, -scrollY);
                 si++;
@@ -153,9 +153,9 @@ Map::~Map()
 {
     // delete metadata, layers, tilesets and overlays
     delete[] mMetaTiles;
-    for_each(mLayers.begin(), mLayers.end(), make_dtor(mLayers));
-    for_each(mTilesets.begin(), mTilesets.end(), make_dtor(mTilesets));
-    for_each(mOverlays.begin(), mOverlays.end(), make_dtor(mOverlays));
+    delete_all(mLayers);
+    delete_all(mTilesets);
+    delete_all(mOverlays);
 }
 
 void Map::initializeOverlays()
@@ -218,7 +218,8 @@ void Map::draw(Graphics *graphics, int scrollX, int scrollY)
     mSprites.sort(spriteCompare);
 
     Layers::const_iterator layeri = mLayers.begin();
-    for (; layeri != mLayers.end(); ++layeri) {
+    for (; layeri != mLayers.end(); ++layeri)
+    {
         (*layeri)->draw(graphics,
                         startX, startY, endX, endY,
                         scrollX, scrollY,
@@ -285,7 +286,7 @@ Tileset* Map::getTilesetWithGid(int gid) const
     containsGid.gid = gid;
 
     Tilesets::const_iterator i = find_if(mTilesets.begin(), mTilesets.end(),
-            containsGid);
+              containsGid);
 
     return (i == mTilesets.end()) ? NULL : *i;
 }
@@ -294,7 +295,7 @@ void Map::setWalk(int x, int y, bool walkable)
 {
     mMetaTiles[x + y * mWidth].walkable = walkable;
 }
-
+ 
 bool Map::occupied(int x, int y) const
 {
     Beings &beings = beingManager->getAll();
@@ -312,7 +313,7 @@ bool Map::occupied(int x, int y) const
 
 bool Map::tileCollides(int x, int y) const
 {
-    return !(contains(x, y) && mMetaTiles[x + y * mWidth].walkable);
+     return !(contains(x, y) && mMetaTiles[x + y * mWidth].walkable);
 }
 
 bool Map::contains(int x, int y) const
@@ -414,13 +415,6 @@ Path Map::findPath(int startX, int startY, int destX, int destY)
                 // 14 for moving diagonal (sqrt(200) = 14.1421...)
                 int Gcost = curr.tile->Gcost + ((dx == 0 || dy == 0) ? 10 : 14);
 
-                // It costs extra to walk through a being (needs to be enough
-                // to make it more attractive to walk around).
-                if (occupied(x, y))
-                {
-                    Gcost += 30;
-                }
-
                 // Skip if Gcost becomes too much
                 // Warning: probably not entirely accurate
                 if (Gcost > 200)
@@ -509,11 +503,14 @@ void Map::addParticleEffect(const std::string &effectFile, int x, int y)
 
 void Map::initializeParticleEffects(Particle* particleEngine)
 {
-    for (std::list<ParticleEffectData>::iterator i = particleEffects.begin();
-         i != particleEffects.end();
-         i++
-        )
+    if (config.getValue("particleeffects", 1))
     {
-        particleEngine->addEffect(i->file, i->x, i->y);
+        for (std::list<ParticleEffectData>::iterator i = particleEffects.begin();
+             i != particleEffects.end();
+             i++
+            )
+        {
+            particleEngine->addEffect(i->file, i->x, i->y);
+        }
     }
 }