From 405c23831a4e1363f26f848215c8140f6d6d9f78 Mon Sep 17 00:00:00 2001 From: Björn Steinbrink Date: Wed, 8 Mar 2006 19:13:26 +0000 Subject: Added a 'dtor' helper functor to delete objects in arrays and containers using STL algorithms. --- src/graphic/spriteset.cpp | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'src/graphic') diff --git a/src/graphic/spriteset.cpp b/src/graphic/spriteset.cpp index e0a1ef36..96ba4313 100644 --- a/src/graphic/spriteset.cpp +++ b/src/graphic/spriteset.cpp @@ -25,13 +25,13 @@ #include "../resources/image.h" +#include "../utils/dtor.h" + Spriteset::Spriteset(Image *img, int width, int height) { - int x, y; - - for (y = 0; y + height <= img->getHeight(); y += height) + for (int y = 0; y + height <= img->getHeight(); y += height) { - for (x = 0; x + width <= img->getWidth(); x += width) + for (int x = 0; x + width <= img->getWidth(); x += width) { spriteset.push_back(img->getSubImage(x, y, width, height)); } @@ -40,7 +40,5 @@ Spriteset::Spriteset(Image *img, int width, int height) Spriteset::~Spriteset() { - for (unsigned int i = 0; i < spriteset.size(); i++) { - delete spriteset[i]; - } + for_each(spriteset.begin(), spriteset.end(), make_dtor(spriteset)); } -- cgit v1.2.3-70-g09d2