Merged revisions 4071,4093,4100,4363 via svnmerge from

https://themanaworld.svn.sourceforge.net/svnroot/themanaworld/tmw/branches/0.0

........
  r4071 | the_enemy | 2008-04-11 16:12:30 +0200 (Fri, 11 Apr 2008) | 3 lines
  
   Players now need to
          click on the monster sprites rather than the tile. Players will now
          move to the target before attacking it.
........
  r4093 | the_enemy | 2008-04-15 18:10:32 +0200 (Tue, 15 Apr 2008) | 1 line
  
  Fixed clicking near player.
........
  r4100 | peaveydk | 2008-04-16 13:59:36 +0200 (Wed, 16 Apr 2008) | 1 line
  
  Cancel walking to a clicked monster if the target is lost while getting to it (killed or otherwise removed).
........
  r4363 | crush_tmw | 2008-06-24 14:42:04 +0200 (Tue, 24 Jun 2008) | 1 line
  
  corrected date in changelog
........

1 files changed, 6 insertions, 8 deletions

diff --git a/src/effectmanager.cpp b/src/effectmanager.cpp
index bb8b5733..87d98834 100644
--- a/src/effectmanager.cpp
+++ b/src/effectmanager.cpp
@@ -42,12 +42,10 @@ EffectManager::EffectManager()
     else
     {
         logger->log("Effects are now loading");
-    } 
+    }
 
     for_each_xml_child_node(node, root)
     {
-        int id;
-
         if (xmlStrEqual(node->name, BAD_CAST "effect"))
         {
             EffectDescription ed;
@@ -61,22 +59,22 @@ EffectManager::EffectManager()
 
 EffectManager::~EffectManager()
 {
-
 }
 
 bool EffectManager::trigger(int id, int x, int y)
 {
     bool rValue = false;
-    for (std::list<EffectDescription>::iterator i = mEffects.begin(); i != mEffects.end(); ++i)
+    for (std::list<EffectDescription>::iterator i = mEffects.begin();
+            i != mEffects.end(); ++i)
     {
         if ((*i).id == id)
         {
             rValue = true;
-            if((*i).GFX != "")
+            if ((*i).GFX != "")
                 particleEngine->addEffect((*i).GFX, x, y);
-            if((*i).SFX != "")
+            if ((*i).SFX != "")
                 sound.playSfx((*i).SFX);
-            break;            
+            break;
         }
     }
     return rValue;