diff options
| author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2006-08-28 23:04:08 +0000 |
|---|---|---|
| committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2006-08-28 23:04:08 +0000 |
| commit | 391203d83ed7a72b54fb7d7c72dbe35db14f0ea9 (patch) | |
| tree | a9a9e14bbbdde0b48c66b99038d505a42a51609b /src/gui/equipmentwindow.cpp | |
| parent | af61e1e7df91b97c3f7516e9eb2b37b621f069ad (diff) | |
| download | mana-client-391203d83ed7a72b54fb7d7c72dbe35db14f0ea9.tar.gz mana-client-391203d83ed7a72b54fb7d7c72dbe35db14f0ea9.tar.bz2 mana-client-391203d83ed7a72b54fb7d7c72dbe35db14f0ea9.tar.xz mana-client-391203d83ed7a72b54fb7d7c72dbe35db14f0ea9.zip | |
Merged trunk development between revisions 2530 and 2618 to the 0.1.0 branch.
Diffstat (limited to 'src/gui/equipmentwindow.cpp')
| -rw-r--r-- | src/gui/equipmentwindow.cpp | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/gui/equipmentwindow.cpp b/src/gui/equipmentwindow.cpp index bef39dff..2cbffde4 100644 --- a/src/gui/equipmentwindow.cpp +++ b/src/gui/equipmentwindow.cpp @@ -40,15 +40,10 @@ EquipmentWindow::EquipmentWindow(Equipment *equipment): setWindowName("Equipment"); setDefaultSize(5, 230, 200, 120); loadWindowState(); - - mItemset = ResourceManager::getInstance()->getSpriteset( - "graphics/sprites/items.png", 32, 32); - if (!mItemset) logger->error("Unable to load items.png"); } EquipmentWindow::~EquipmentWindow() { - mItemset->decRef(); } void EquipmentWindow::draw(gcn::Graphics *graphics) @@ -70,7 +65,7 @@ void EquipmentWindow::draw(gcn::Graphics *graphics) continue; } - image = mItemset->get(item->getInfo()->getImage() - 1); + image = item->getInfo()->getImage(); dynamic_cast<Graphics*>(graphics)->drawImage( image, 36 * (i % 4) + 10, 36 * (i / 4) + 25); } @@ -81,7 +76,7 @@ void EquipmentWindow::draw(gcn::Graphics *graphics) return; } - image = mItemset->get(item->getInfo()->getImage() - 1); + image = item->getInfo()->getImage(); dynamic_cast<Graphics*>(graphics)->drawImage(image, 160, 25); graphics->drawText(toString(item->getQuantity()), 170, 62, |