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.

1 files changed, 13 insertions, 4 deletions

diff --git a/src/gui/inventory.h b/src/gui/inventory.h
index 43a23ede..37edff7f 100644
--- a/src/gui/inventory.h
+++ b/src/gui/inventory.h
@@ -37,7 +37,8 @@
  *
  * \ingroup Interface
  */
-class InventoryWindow : public Window, gcn::ActionListener {
+class InventoryWindow : public Window, gcn::ActionListener
+{
     public:
         /**
          * Constructor.
@@ -50,6 +51,11 @@ class InventoryWindow : public Window, gcn::ActionListener {
         ~InventoryWindow();
 
         /**
+         * Logic (updates buttons)
+         */
+        void logic();
+
+        /**
          * Add an item the inventory.
          */
         int addItem(int index, int id, int quantity, bool equipment);
@@ -58,14 +64,17 @@ class InventoryWindow : public Window, gcn::ActionListener {
          * Remove a item from the inventory.
          */
         int removeItem(int id);
-        
+
+        /**
+         * Equips an item.
+         */
         void equipItem(int index);
 
         /**
          * Unequips an item.
          */
         void unequipItem(int index);
-        
+
         /**
          * Change quantity of an item.
          */
@@ -94,7 +103,7 @@ class InventoryWindow : public Window, gcn::ActionListener {
 
         int useItem(int index, int id);
         void updateWidgets();    /** Updates widgets size/position */
-        void updateUseButton();  /** Updates use button to selected item */
+        void updateButtons();    /** Updates button states */
 
         gcn::Label *itemNameLabel;
         gcn::Label *itemDescriptionLabel;