Merged cleanups and content changes from the trunk. Also fixed compiling with

OpenGL enabled.

1 files changed, 3 insertions, 12 deletions

diff --git a/src/engine.cpp b/src/engine.cpp
index c6a4e55c..84574b26 100644
--- a/src/engine.cpp
+++ b/src/engine.cpp
@@ -25,7 +25,6 @@
 
 #include <list>
 
-#include "animation.h"
 #include "being.h"
 #include "beingmanager.h"
 #include "flooritemmanager.h"
@@ -34,7 +33,6 @@
 #include "main.h"
 #include "localplayer.h"
 #include "log.h"
-#include "main.h"
 #include "map.h"
 #include "sound.h"
 
@@ -63,8 +61,6 @@ Spriteset *itemset;
 Spriteset *emotionset;
 Spriteset *npcset;
 std::vector<Spriteset *> weaponset;
-AnimatedSprite *animatedSprite;
-
 
 Engine::Engine(Network *network):
     mShowDebugPath(false),
@@ -104,16 +100,11 @@ Engine::~Engine()
     emotionset->decRef();
     itemset->decRef();
 
-    std::vector<Spriteset *>::iterator iter;
-    for (iter = weaponset.begin(); iter != weaponset.end(); ++iter)
-    {
-        (*iter)->decRef();
-    }
+    std::for_each(weaponset.begin(), weaponset.end(),
+            std::mem_fun(&Spriteset::decRef));
     weaponset.clear();
 
     delete itemDb;
-
-    delete animatedSprite;
 }
 
 void Engine::changeMap(const std::string &mapPath)
@@ -219,12 +210,12 @@ void Engine::draw(Graphics *graphics)
                 player_node->mX, player_node->mY,
                 mouseTileX, mouseTileY);
 
+        graphics->setColor(gcn::Color(255, 0, 0));
         for (PathIterator i = debugPath.begin(); i != debugPath.end(); i++)
         {
             int squareX = i->x * 32 - map_x + 12;
             int squareY = i->y * 32 - map_y + 12;
 
-            graphics->setColor(gcn::Color(255, 0, 0));
             graphics->fillRectangle(gcn::Rectangle(squareX, squareY, 8, 8));
             graphics->drawText(
                     toString(mCurrentMap->getMetaTile(i->x, i->y)->Gcost),