3 files changed, 7 insertions, 9 deletions
diff --git a/src/gui/equipmentwindow.cpp b/src/gui/equipmentwindow.cpp
index fd979beb..bef39dff 100644
--- a/src/gui/equipmentwindow.cpp
+++ b/src/gui/equipmentwindow.cpp
@@ -28,10 +28,9 @@
 #include "../item.h"
 #include "../log.h"
 
-#include "../graphic/spriteset.h"
-
 #include "../resources/iteminfo.h"
 #include "../resources/resourcemanager.h"
+#include "../resources/spriteset.h"
 
 #include "../utils/tostring.h"
 
@@ -42,14 +41,14 @@ EquipmentWindow::EquipmentWindow(Equipment *equipment):
     setDefaultSize(5, 230, 200, 120);
     loadWindowState();
 
-    mItemset = ResourceManager::getInstance()->createSpriteset(
+    mItemset = ResourceManager::getInstance()->getSpriteset(
             "graphics/sprites/items.png", 32, 32);
     if (!mItemset) logger->error("Unable to load items.png");
 }
 
 EquipmentWindow::~EquipmentWindow()
 {
-    delete mItemset;
+    mItemset->decRef();
 }
 
 void EquipmentWindow::draw(gcn::Graphics *graphics)
diff --git a/src/gui/itemcontainer.cpp b/src/gui/itemcontainer.cpp
index 9b8dc09b..edcf9764 100644
--- a/src/gui/itemcontainer.cpp
+++ b/src/gui/itemcontainer.cpp
@@ -30,11 +30,10 @@
 #include "../item.h"
 #include "../log.h"
 
-#include "../graphic/spriteset.h"
-
 #include "../resources/image.h"
 #include "../resources/iteminfo.h"
 #include "../resources/resourcemanager.h"
+#include "../resources/spriteset.h"
 
 #include "../utils/tostring.h"
 
@@ -42,7 +41,7 @@ ItemContainer::ItemContainer(Inventory *inventory):
     mInventory(inventory)
 {
     ResourceManager *resman = ResourceManager::getInstance();
-    mItemset = resman->createSpriteset("graphics/sprites/items.png", 32, 32);
+    mItemset = resman->getSpriteset("graphics/sprites/items.png", 32, 32);
     if (!mItemset) logger->error("Unable to load items.png");
 
     mSelImg = resman->getImage("graphics/gui/selection.png");
@@ -56,7 +55,7 @@ ItemContainer::ItemContainer(Inventory *inventory):
 
 ItemContainer::~ItemContainer()
 {
-    delete mItemset;
+    mItemset->decRef();
     mSelImg->decRef();
 }
 
diff --git a/src/gui/playerbox.cpp b/src/gui/playerbox.cpp
index d5c70ffe..f0ed9b71 100644
--- a/src/gui/playerbox.cpp
+++ b/src/gui/playerbox.cpp
@@ -27,10 +27,10 @@
 #include "../graphics.h"
 
 #include "../graphic/imagerect.h"
-#include "../graphic/spriteset.h"
 
 #include "../resources/image.h"
 #include "../resources/resourcemanager.h"
+#include "../resources/spriteset.h"
 
 #include "../utils/dtor.h"