Merge branch '1.0'

Conflicts:
	src/beingmanager.cpp
	src/beingmanager.h
	src/client.cpp
	src/localplayer.cpp

3 files changed, 7 insertions, 2 deletions

diff --git a/src/resources/ambientlayer.cpp b/src/resources/ambientlayer.cpp
index 780baf00..50fe8bd9 100644
--- a/src/resources/ambientlayer.cpp
+++ b/src/resources/ambientlayer.cpp
@@ -51,6 +51,7 @@ AmbientLayer::AmbientLayer(Image *img, float parallax,
             std::string idPath = mImage->getIdPath() + "_rescaled";
             ResourceManager::getInstance()->addResource(idPath, rescaledOverlay);
             mImage = rescaledOverlay;
+            rescaledOverlay->incRef();
         }
         else
             mImage->incRef();
diff --git a/src/resources/mapreader.cpp b/src/resources/mapreader.cpp
index 219eb317..e8a2bd20 100644
--- a/src/resources/mapreader.cpp
+++ b/src/resources/mapreader.cpp
@@ -369,7 +369,7 @@ static void setTile(Map *map, MapLayer *layer, int x, int y, int gid)
     else
     {
         // Set collision tile
-        if (set && (gid - set->getFirstGid() != 0))
+        if (set && (gid - set->getFirstGid() == 1))
             map->blockTile(x, y, Map::BLOCKTYPE_WALL);
     }
 }
diff --git a/src/resources/resourcemanager.cpp b/src/resources/resourcemanager.cpp
index 3d23edcd..3013f20b 100644
--- a/src/resources/resourcemanager.cpp
+++ b/src/resources/resourcemanager.cpp
@@ -318,7 +318,11 @@ struct DyedImageLoader
         }
         int fileSize;
         void *buffer = l->manager->loadFile(path, fileSize);
-        if (!buffer) return NULL;
+        if (!buffer)
+        {
+            delete d;
+            return NULL;
+        }
         Resource *res = d ? Image::load(buffer, fileSize, *d)
                           : Image::load(buffer, fileSize);
         free(buffer);