diff options
| author | David Athay <ko2fan@gmail.com> | 2009-05-21 10:20:32 +0100 |
|---|---|---|
| committer | David Athay <ko2fan@gmail.com> | 2009-05-21 10:20:32 +0100 |
| commit | 2dad08e4e8e199c84da6a6f2f5289c8c0e40fc81 (patch) | |
| tree | 293d4922893dfffcc065604743116e653c3b8d37 /src/gui/widgets/progressbar.cpp | |
| parent | dc1eb0895382451b1c79c60ecb7ca7dbbec89681 (diff) | |
| parent | 244b0d9b46128ab3498da078020c8bbf8c65f69f (diff) | |
| download | mana-client-2dad08e4e8e199c84da6a6f2f5289c8c0e40fc81.tar.gz mana-client-2dad08e4e8e199c84da6a6f2f5289c8c0e40fc81.tar.bz2 mana-client-2dad08e4e8e199c84da6a6f2f5289c8c0e40fc81.tar.xz mana-client-2dad08e4e8e199c84da6a6f2f5289c8c0e40fc81.zip | |
Merge branch 'master' of git@gitorious.org:tmw/mainline
Diffstat (limited to 'src/gui/widgets/progressbar.cpp')
| -rw-r--r-- | src/gui/widgets/progressbar.cpp | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/src/gui/widgets/progressbar.cpp b/src/gui/widgets/progressbar.cpp index 58f24651..c673ffb3 100644 --- a/src/gui/widgets/progressbar.cpp +++ b/src/gui/widgets/progressbar.cpp @@ -31,6 +31,8 @@ #include "resources/image.h" #include "resources/resourcemanager.h" +#include "utils/dtor.h" + #include <guichan/font.hpp> ImageRect ProgressBar::mBorder; @@ -59,7 +61,7 @@ ProgressBar::ProgressBar(float progress, mBorder.grid[1] = dBorders->getSubImage(4, 0, 3, 4); mBorder.grid[2] = dBorders->getSubImage(7, 0, 4, 4); mBorder.grid[3] = dBorders->getSubImage(0, 4, 4, 10); - mBorder.grid[4] = resman->getImage("graphics/gui/bg_quad_dis.png"); + mBorder.grid[4] = dBorders->getSubImage(4, 4, 3, 10); mBorder.grid[5] = dBorders->getSubImage(7, 4, 4, 10); mBorder.grid[6] = dBorders->getSubImage(0, 15, 4, 4); mBorder.grid[7] = dBorders->getSubImage(4, 15, 3, 4); @@ -82,15 +84,7 @@ ProgressBar::~ProgressBar() if (mInstances == 0) { - delete mBorder.grid[0]; - delete mBorder.grid[1]; - delete mBorder.grid[2]; - delete mBorder.grid[3]; - mBorder.grid[4]->decRef(); - delete mBorder.grid[5]; - delete mBorder.grid[6]; - delete mBorder.grid[7]; - delete mBorder.grid[8]; + for_each(mBorder.grid, mBorder.grid + 9, dtor<Image*>()); } } |