diff options
author | Andrei Karas <akaras@inbox.ru> | 2011-11-08 00:44:17 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2011-11-08 00:44:17 +0300 |
commit | 4cea2a5cd85b8d3ad905eb3b337b28284c62d4fe (patch) | |
tree | 714897eca03fbcb764f5b450a29cc1aef8d33433 /src/resources/resourcemanager.cpp | |
parent | 9e83411f7e4147d09af5a5006888dcc187ea0ef8 (diff) | |
download | manaplus-4cea2a5cd85b8d3ad905eb3b337b28284c62d4fe.tar.gz manaplus-4cea2a5cd85b8d3ad905eb3b337b28284c62d4fe.tar.bz2 manaplus-4cea2a5cd85b8d3ad905eb3b337b28284c62d4fe.tar.xz manaplus-4cea2a5cd85b8d3ad905eb3b337b28284c62d4fe.zip |
Fix more gcc 4.7 warnings.
Diffstat (limited to 'src/resources/resourcemanager.cpp')
-rw-r--r-- | src/resources/resourcemanager.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/resources/resourcemanager.cpp b/src/resources/resourcemanager.cpp index af9f664d4..a99ca622e 100644 --- a/src/resources/resourcemanager.cpp +++ b/src/resources/resourcemanager.cpp @@ -94,7 +94,7 @@ ResourceManager::~ResourceManager() continue; } #endif - if (dynamic_cast<SpriteDef*>(iter->second) != 0) + if (dynamic_cast<SpriteDef*>(iter->second)) { cleanUp(iter->second); ResourceIterator toErase = iter; @@ -118,7 +118,7 @@ ResourceManager::~ResourceManager() continue; } #endif - if (dynamic_cast<ImageSet*>(iter->second) != 0) + if (dynamic_cast<ImageSet*>(iter->second)) { cleanUp(iter->second); ResourceIterator toErase = iter; @@ -574,7 +574,7 @@ ResourceManager *ResourceManager::getInstance() void ResourceManager::deleteInstance() { delete instance; - instance = 0; + instance = nullptr; } void *ResourceManager::loadFile(const std::string &fileName, int &fileSize) @@ -748,7 +748,7 @@ struct RescaledLoader Image *ResourceManager::getRescaled(Image *image, int width, int height) { if (!image) - return 0; + return nullptr; std::string idPath = image->getIdPath() + strprintf( "_rescaled%dx%d", width, height); |