diff options
| author | Andrei Karas <akaras@inbox.ru> | 2013-01-20 20:43:54 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2013-01-20 23:48:07 +0300 |
| commit | 2744e4fa8f39cd06bfe557a5a3881830bd11501c (patch) | |
| tree | 2ec96c6ee820cfe0e5e76480fe828501bf555a4b /src/resources/resourcemanager.cpp | |
| parent | 531433248fbad49e2b8e9d90de9855f3ea9b2257 (diff) | |
| download | manaplus-2744e4fa8f39cd06bfe557a5a3881830bd11501c.tar.gz manaplus-2744e4fa8f39cd06bfe557a5a3881830bd11501c.tar.bz2 manaplus-2744e4fa8f39cd06bfe557a5a3881830bd11501c.tar.xz manaplus-2744e4fa8f39cd06bfe557a5a3881830bd11501c.zip | |
Last part with FOR_EACH changes.
Diffstat (limited to 'src/resources/resourcemanager.cpp')
| -rw-r--r-- | src/resources/resourcemanager.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/resources/resourcemanager.cpp b/src/resources/resourcemanager.cpp index ca96f5f25..542a96a9e 100644 --- a/src/resources/resourcemanager.cpp +++ b/src/resources/resourcemanager.cpp @@ -1024,11 +1024,8 @@ void ResourceManager::scheduleDelete(SDL_Surface *const surface) void ResourceManager::clearScheduled() { BLOCK_START("ResourceManager::clearScheduled") - for (std::set<SDL_Surface*>::iterator i = deletedSurfaces.begin(), - i_end = deletedSurfaces.end(); i != i_end; ++i) - { + FOR_EACH (std::set<SDL_Surface*>::iterator, i, deletedSurfaces) SDL_FreeSurface(*i); - } deletedSurfaces.clear(); BLOCK_END("ResourceManager::clearScheduled") } @@ -1100,8 +1097,7 @@ void ResourceManager::delayedLoad() void ResourceManager::removeDelayLoad(const AnimationDelayLoad *const delayedLoad) { - for (DelayedAnimIter it = mDelayedAnimations.begin(), - it_end = mDelayedAnimations.end(); it != it_end; ++ it) + FOR_EACH (DelayedAnimIter, it, mDelayedAnimations) { if (*it == delayedLoad) { |