summaryrefslogtreecommitdiff
path: root/src/resources
diff options
context:
space:
mode:
authorEugenio Favalli <elvenprogrammer@gmail.com>2006-07-19 15:12:06 +0000
committerEugenio Favalli <elvenprogrammer@gmail.com>2006-07-19 15:12:06 +0000
commit4050f8c0bced625a95d542d30647c3f8bbf2267b (patch)
tree420d65a5ed6a2155762b4e13a4c90ab2df9f888e /src/resources
parentda3a1fd114dd7b8e5e8c880bd987506acc16ac42 (diff)
downloadmana-4050f8c0bced625a95d542d30647c3f8bbf2267b.tar.gz
mana-4050f8c0bced625a95d542d30647c3f8bbf2267b.tar.bz2
mana-4050f8c0bced625a95d542d30647c3f8bbf2267b.tar.xz
mana-4050f8c0bced625a95d542d30647c3f8bbf2267b.zip
Merged new_animation branch until r2415 into trunk.
Diffstat (limited to 'src/resources')
-rw-r--r--src/resources/imagewriter.cpp2
-rw-r--r--src/resources/itemmanager.cpp3
2 files changed, 3 insertions, 2 deletions
diff --git a/src/resources/imagewriter.cpp b/src/resources/imagewriter.cpp
index f4be3a66..7cfa16b4 100644
--- a/src/resources/imagewriter.cpp
+++ b/src/resources/imagewriter.cpp
@@ -55,7 +55,7 @@ bool ImageWriter::writePNG(SDL_Surface *surface,
logger->log("Had trouble creating png_structp");
return false;
}
-
+
info_ptr = png_create_info_struct(png_ptr);
if (!info_ptr)
{
diff --git a/src/resources/itemmanager.cpp b/src/resources/itemmanager.cpp
index d18152da..56ac6354 100644
--- a/src/resources/itemmanager.cpp
+++ b/src/resources/itemmanager.cpp
@@ -21,10 +21,11 @@
* $Id$
*/
+#include "itemmanager.h"
+
#include <libxml/tree.h>
#include "iteminfo.h"
-#include "itemmanager.h"
#include "resourcemanager.h"
#include "../log.h"