summaryrefslogtreecommitdiff
path: root/src/resources
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2011-06-08 15:39:25 +0300
committerAndrei Karas <akaras@inbox.ru>2011-06-08 15:39:25 +0300
commit3c7ec0569a4fce157e608021133bdc6cac679c10 (patch)
tree1bb8af393516cc315bcc1ec022766b184fb82d33 /src/resources
parent943c206816027b21e9d658517a0640b92df4763d (diff)
downloadmv-3c7ec0569a4fce157e608021133bdc6cac679c10.tar.gz
mv-3c7ec0569a4fce157e608021133bdc6cac679c10.tar.bz2
mv-3c7ec0569a4fce157e608021133bdc6cac679c10.tar.xz
mv-3c7ec0569a4fce157e608021133bdc6cac679c10.zip
Zero variables after calling decRef().
Diffstat (limited to 'src/resources')
-rw-r--r--src/resources/ambientlayer.cpp3
-rw-r--r--src/resources/image.cpp3
-rw-r--r--src/resources/spritedef.cpp3
3 files changed, 9 insertions, 0 deletions
diff --git a/src/resources/ambientlayer.cpp b/src/resources/ambientlayer.cpp
index 92d9eb43e..a0f3803eb 100644
--- a/src/resources/ambientlayer.cpp
+++ b/src/resources/ambientlayer.cpp
@@ -74,7 +74,10 @@ AmbientLayer::AmbientLayer(Image *img, float parallax,
AmbientLayer::~AmbientLayer()
{
if (mImage)
+ {
mImage->decRef();
+ mImage = 0;
+ }
}
void AmbientLayer::update(int timePassed, float dx, float dy)
diff --git a/src/resources/image.cpp b/src/resources/image.cpp
index aa5c33488..4a89ae636 100644
--- a/src/resources/image.cpp
+++ b/src/resources/image.cpp
@@ -828,7 +828,10 @@ SubImage::~SubImage()
mGLImage = 0;
#endif
if (mParent)
+ {
mParent->decRef();
+ mParent = 0;
+ }
}
Image *SubImage::getSubImage(int x, int y, int w, int h)
diff --git a/src/resources/spritedef.cpp b/src/resources/spritedef.cpp
index 37610f659..79e665f4c 100644
--- a/src/resources/spritedef.cpp
+++ b/src/resources/spritedef.cpp
@@ -359,7 +359,10 @@ SpriteDef::~SpriteDef()
i != mImageSets.end(); ++i)
{
if (i->second)
+ {
i->second->decRef();
+ i->second = 0;
+ }
}
}