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, 11 insertions, 9 deletions

diff --git a/src/resources/itemmanager.cpp b/src/resources/itemmanager.cpp
index 05b0ff44..8ac05e08 100644
--- a/src/resources/itemmanager.cpp
+++ b/src/resources/itemmanager.cpp
@@ -26,6 +26,7 @@
 #include <iostream>
 
 #include "itemmanager.h"
+#include "resourcemanager.h"
 #include "../main.h"
 #include "../log.h"
 
@@ -38,16 +39,16 @@
 
 ItemManager::ItemManager()
 {
-    // Check that file exists before trying to parse it
-    std::fstream dbFile;
-    dbFile.open(TMW_DATADIR "data/items.xml", std::ios::in);
-    if (!dbFile.is_open()) {
-        logger->error("Cannot find item database (items.xml)!");
-        return;
+    ResourceManager *resman = ResourceManager::getInstance();
+    int size;
+    char *data = (char*)resman->loadFile("items.xml", size);
+
+    if (!data) {
+        logger->error("Could not find items.xml!");
     }
-    dbFile.close();
 
-    xmlDocPtr doc = xmlParseFile(TMW_DATADIR "data/items.xml");
+    xmlDocPtr doc = xmlParseMemory(data, size);
+    free(data);
 
     if (doc) {
         xmlNodePtr node = xmlDocGetRootElement(doc);
@@ -104,7 +105,8 @@ ItemManager::ItemManager()
         }
 
         xmlFreeDoc(doc);
-    } else {
+    }
+    else {
         logger->error("Error while parsing item database (items.xml)!");
     }