diff options
| author | Björn Steinbrink <B.Steinbrink@gmx.de> | 2006-01-22 13:31:13 +0000 |
|---|---|---|
| committer | Björn Steinbrink <B.Steinbrink@gmx.de> | 2006-01-22 13:31:13 +0000 |
| commit | bd56bf8afdab16383ed8ad08412a8c807f84af85 (patch) | |
| tree | 0e963ada63bcbe3c50dd77986aaa15b9ba49816a /src/gui/equipmentwindow.cpp | |
| parent | 5359640b6f271af31f6423df9d661433eff89a3e (diff) | |
| download | Mana-bd56bf8afdab16383ed8ad08412a8c807f84af85.tar.gz Mana-bd56bf8afdab16383ed8ad08412a8c807f84af85.tar.bz2 Mana-bd56bf8afdab16383ed8ad08412a8c807f84af85.tar.xz Mana-bd56bf8afdab16383ed8ad08412a8c807f84af85.zip | |
Merged NETWORK branch (includes BEING_OVERHAUL).
Diffstat (limited to 'src/gui/equipmentwindow.cpp')
| -rw-r--r-- | src/gui/equipmentwindow.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/gui/equipmentwindow.cpp b/src/gui/equipmentwindow.cpp index d3b5fc6b..f1b9b4ba 100644 --- a/src/gui/equipmentwindow.cpp +++ b/src/gui/equipmentwindow.cpp @@ -35,8 +35,8 @@ #include <sstream> -EquipmentWindow::EquipmentWindow(): - Window("Equipment") +EquipmentWindow::EquipmentWindow(Equipment *equipment): + Window("Equipment"), mEquipment(equipment) { setWindowName("Equipment"); setDefaultSize(5, 230, 200, 90); @@ -57,7 +57,6 @@ void EquipmentWindow::draw(gcn::Graphics *graphics) // Draw window graphics Window::draw(graphics); - Equipment *equipment = Equipment::getInstance(); Item *item; Image *image; @@ -66,7 +65,7 @@ void EquipmentWindow::draw(gcn::Graphics *graphics) graphics->drawRectangle(gcn::Rectangle(10 + 36 * (i % 4), 36 * (i / 4) + 25, 32, 32)); - if (!(item = equipment->getEquipment(i))) { + if (!(item = mEquipment->getEquipment(i))) { continue; } @@ -78,7 +77,7 @@ void EquipmentWindow::draw(gcn::Graphics *graphics) graphics->setColor(gcn::Color(0, 0, 0)); graphics->drawRectangle(gcn::Rectangle(160, 25, 32, 32)); - if (!(item = equipment->getArrows())) { + if (!(item = mEquipment->getArrows())) { return; } |