summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDennis Friis <peavey@placid.dk>2008-11-06 20:17:51 +0000
committerDennis Friis <peavey@placid.dk>2008-11-06 20:17:51 +0000
commitaf58f011a36fdfda135ca6b71504f30cb561be6b (patch)
tree6fe7b11c8a253883f045a1f4580d9664c95d60ae
parentf96b25dc1f23fd88e0ae338cafaee791d6bf1f01 (diff)
downloadmana-af58f011a36fdfda135ca6b71504f30cb561be6b.tar.gz
mana-af58f011a36fdfda135ca6b71504f30cb561be6b.tar.bz2
mana-af58f011a36fdfda135ca6b71504f30cb561be6b.tar.xz
mana-af58f011a36fdfda135ca6b71504f30cb561be6b.zip
Tweak member naming to fit conventions as a fix to r4934.
-rw-r--r--src/gui/equipmentwindow.cpp6
-rw-r--r--src/gui/equipmentwindow.h2
2 files changed, 4 insertions, 4 deletions
diff --git a/src/gui/equipmentwindow.cpp b/src/gui/equipmentwindow.cpp
index 3ea2fcbc..83e166c5 100644
--- a/src/gui/equipmentwindow.cpp
+++ b/src/gui/equipmentwindow.cpp
@@ -42,7 +42,7 @@ EquipmentWindow::EquipmentWindow(Equipment *equipment):
setCloseButton(true);
setDefaultSize(5, 230, 200, 120);
loadWindowState();
- inventory = player_node->getInventory();
+ mInventory = player_node->getInventory();
}
EquipmentWindow::~EquipmentWindow()
@@ -64,7 +64,7 @@ void EquipmentWindow::draw(gcn::Graphics *graphics)
graphics->drawRectangle(gcn::Rectangle(10 + 36 * (i % 4),
36 * (i / 4) + 25, 32, 32));
- if (!(item = inventory->getItem(mEquipment->getEquipment(i))))
+ if (!(item = mInventory->getItem(mEquipment->getEquipment(i))))
continue;
image = item->getImage();
@@ -77,7 +77,7 @@ void EquipmentWindow::draw(gcn::Graphics *graphics)
graphics->drawRectangle(gcn::Rectangle(160, 25, 32, 32));
- if (!(item = inventory->getItem(mEquipment->getArrows())))
+ if (!(item = mInventory->getItem(mEquipment->getArrows())))
return;
image = item->getImage();
diff --git a/src/gui/equipmentwindow.h b/src/gui/equipmentwindow.h
index c853a039..2130b7ce 100644
--- a/src/gui/equipmentwindow.h
+++ b/src/gui/equipmentwindow.h
@@ -54,7 +54,7 @@ class EquipmentWindow : public Window
private:
Equipment *mEquipment;
- Inventory *inventory;
+ Inventory *mInventory;
};
extern EquipmentWindow *equipmentWindow;