diff options
| author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2005-05-21 22:39:53 +0000 |
|---|---|---|
| committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2005-05-21 22:39:53 +0000 |
| commit | e4e3f73db10d345453f2c6d06ae1dc499a4c7404 (patch) | |
| tree | 7117443cf1267f9354206c21d70ac4ae0ddefcec /src/gui/itemcontainer.cpp | |
| parent | 241e2461446a830194f202b840abcd3598f804a5 (diff) | |
| download | mana-e4e3f73db10d345453f2c6d06ae1dc499a4c7404.tar.gz mana-e4e3f73db10d345453f2c6d06ae1dc499a4c7404.tar.bz2 mana-e4e3f73db10d345453f2c6d06ae1dc499a4c7404.tar.xz mana-e4e3f73db10d345453f2c6d06ae1dc499a4c7404.zip | |
Numerous things:
* Fixed two non-virtual destructor warnings showing up with GCC 4.
* Fixed OpenGL inventory text drawing that broke in last commit
* Removed glClear cause screen is redrawn completely anyway
* Fixed updating of buttons in inventory window
* Made items.xml be loaded through resource manager.
Diffstat (limited to 'src/gui/itemcontainer.cpp')
| -rw-r--r-- | src/gui/itemcontainer.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/gui/itemcontainer.cpp b/src/gui/itemcontainer.cpp index a5c70632..d571f739 100644 --- a/src/gui/itemcontainer.cpp +++ b/src/gui/itemcontainer.cpp @@ -32,6 +32,7 @@ ItemContainer::ItemContainer() Image *itemImg = resman->getImage("graphics/sprites/items.png", IMG_ALPHA); if (!itemImg) logger->error("Unable to load items.png"); itemset = new Spriteset(itemImg, 20, 20); + itemImg->decRef(); selImg = resman->getImage("graphics/gui/selection.png", IMG_ALPHA); if (!selImg) logger->error("Unable to load selection.png"); @@ -50,6 +51,8 @@ ItemContainer::ItemContainer() ItemContainer::~ItemContainer() { + delete itemset; + selImg->decRef(); } void ItemContainer::draw(gcn::Graphics* graphics) |