Merge branch '0.5'

Conflicts:
	CMakeLists.txt
	po/fi.po
	po/fr.po
	src/gui/skilldialog.cpp
	src/localplayer.cpp
	src/net/manaserv/generalhandler.cpp
	src/net/tmwa/buysellhandler.cpp
	src/net/tmwa/generalhandler.cpp
	src/net/tmwa/playerhandler.cpp
	src/net/tmwa/specialhandler.cpp
	src/winver.h

1 files changed, 1 insertions, 1 deletions

diff --git a/src/resources/spritedef.cpp b/src/resources/spritedef.cpp
index 311c9d1a..51e7ae8e 100644
--- a/src/resources/spritedef.cpp
+++ b/src/resources/spritedef.cpp
@@ -268,7 +268,7 @@ void SpriteDef::loadAnimation(xmlNodePtr animationNode,
                 if (!img)
                 {
                     logger->log("No image at index %d", start + variant_offset);
-                    continue;
+                    break;
                 }
 
                 animation->addFrame(img, delay, offsetX, offsetY);