Merged the movement branch into trunk

I consider this the only way forward. In my tests this code isn't actually
doing worse than what was there before. Of course some cases are a bit broken,
and I'm open to any kind of feedback so that we can fix those issues.

1 files changed, 2 insertions, 3 deletions

diff --git a/src/resources/spritedef.cpp b/src/resources/spritedef.cpp
index 9d98184a..dcfee165 100644
--- a/src/resources/spritedef.cpp
+++ b/src/resources/spritedef.cpp
@@ -232,7 +232,7 @@ SpriteDef::loadAnimation(xmlNodePtr animationNode,
 
             if (!img)
             {
-                logger->log("No image at index " + (index + variant_offset));
+                logger->log("No image at index %d", index + variant_offset);
                 continue;
             }
 
@@ -255,8 +255,7 @@ SpriteDef::loadAnimation(xmlNodePtr animationNode,
 
                 if (!img)
                 {
-                    logger->log("No image at index " +
-                            (start + variant_offset));
+                    logger->log("No image at index %d", start + variant_offset);
                     continue;
                 }