summaryrefslogtreecommitdiff
path: root/src/resources
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-08-21 23:27:33 +0300
committerAndrei Karas <akaras@inbox.ru>2017-08-21 23:27:33 +0300
commitd181a2fb30ac73173fba851d4b2f7ca6f7d46ca0 (patch)
tree643c68086ee1258dbea0943f2928af626f3b9c81 /src/resources
parent5d6e4e9a5875d79173e9d2c867567dc26354240e (diff)
downloadmv-d181a2fb30ac73173fba851d4b2f7ca6f7d46ca0.tar.gz
mv-d181a2fb30ac73173fba851d4b2f7ca6f7d46ca0.tar.bz2
mv-d181a2fb30ac73173fba851d4b2f7ca6f7d46ca0.tar.xz
mv-d181a2fb30ac73173fba851d4b2f7ca6f7d46ca0.zip
Remove useless variables.
Diffstat (limited to 'src/resources')
-rw-r--r--src/resources/image/subimage.cpp3
-rw-r--r--src/resources/loaders/rescaledloader.cpp3
-rw-r--r--src/resources/loaders/xmlloader.cpp3
3 files changed, 3 insertions, 6 deletions
diff --git a/src/resources/image/subimage.cpp b/src/resources/image/subimage.cpp
index 9eda05164..0b14b788e 100644
--- a/src/resources/image/subimage.cpp
+++ b/src/resources/image/subimage.cpp
@@ -227,8 +227,7 @@ void SubImage::decRef()
int SubImage::calcMemoryLocal() const
{
- int sz = static_cast<int>(sizeof(SubImage) +
+ return static_cast<int>(sizeof(SubImage) +
sizeof(std::map<float, SDL_Surface*>)) +
Resource::calcMemoryLocal();
- return sz;
}
diff --git a/src/resources/loaders/rescaledloader.cpp b/src/resources/loaders/rescaledloader.cpp
index cea73b382..e69814d27 100644
--- a/src/resources/loaders/rescaledloader.cpp
+++ b/src/resources/loaders/rescaledloader.cpp
@@ -71,7 +71,6 @@ Image *Loader::getRescaled(const Image *const image,
const std::string idPath = image->mIdPath + strprintf(
"_rescaled%dx%d", width, height);
const RescaledLoader rl = { image, width, height };
- Image *const img = static_cast<Image *>(
+ return static_cast<Image *>(
ResourceManager::get(idPath, RescaledLoader::load, &rl));
- return img;
}
diff --git a/src/resources/loaders/xmlloader.cpp b/src/resources/loaders/xmlloader.cpp
index 2374e44d1..2d06d8128 100644
--- a/src/resources/loaders/xmlloader.cpp
+++ b/src/resources/loaders/xmlloader.cpp
@@ -44,10 +44,9 @@ namespace
return nullptr;
const ResourceLoader *const
rl = static_cast<const ResourceLoader *>(v);
- Resource *const res = new XML::Document(rl->path,
+ return new XML::Document(rl->path,
rl->useResman,
rl->skipError);
- return res;
}
};