Merge commit 'aethyra/master'

Conflicts:
	CMakeLists.txt
	configure.ac
	data/help/header.txt
	packaging/windows/setup.nsi
	po/POTFILES.in
	src/being.cpp
	src/being.h
	src/game.cpp
	src/gui/color.cpp
	src/gui/color.h
	src/gui/equipmentwindow.h
	src/gui/popupmenu.cpp
	src/gui/recorder.cpp
	src/gui/setup_colors.h
	src/gui/setup_keyboard.cpp
	src/gui/setup_keyboard.h
	src/gui/skill.cpp
	src/gui/speechbubble.cpp
	src/gui/speechbubble.h
	src/gui/table.cpp
	src/keyboardconfig.cpp
	src/keyboardconfig.h
	src/localplayer.cpp
	src/main.cpp
	src/main.h
	src/map.cpp
	src/resources/colordb.cpp
	src/resources/colordb.h
	src/resources/emotedb.cpp
	src/resources/emotedb.h
	src/text.cpp
	src/text.h
	src/tmw.rc
	src/winver.h

1 files changed, 4 insertions, 3 deletions

diff --git a/src/map.h b/src/map.h
index 3beab350..9703c5b3 100644
--- a/src/map.h
+++ b/src/map.h
@@ -27,7 +27,6 @@
 
 #include "position.h"
 #include "properties.h"
-#include "simpleanimation.h"
 
 class Animation;
 class AmbientOverlay;
@@ -35,6 +34,7 @@ class Graphics;
 class Image;
 class MapLayer;
 class Particle;
+class SimpleAnimation;
 class Sprite;
 class Tileset;
 
@@ -72,13 +72,14 @@ class TileAnimation
 {
     public:
         TileAnimation(Animation *ani);
+        ~TileAnimation();
         void update();
         void addAffectedTile(MapLayer *layer, int index)
         { mAffected.push_back(std::make_pair(layer, index)); }
     private:
         std::list<std::pair<MapLayer*, int> > mAffected;
-        SimpleAnimation mAnimation;
-        Image* mLastImage;
+        SimpleAnimation *mAnimation;
+        Image *mLastImage;
 };
 
 /**