Implemented caching of spritesets, including a lot of cleanups to the new

animation system. Action now refers to the Spriteset directly and
AnimatedSprite refers to the current Action directly instead of using the
std::map with a std::string constantly. Some methods and parameters are marked
as const. The READ_PROP macro was replaced by static methods. Warnings are
logged when unnamed actions are defined or when actions refer to undefined
imagesets. Code is more tolerant towards missing actions.

1 files changed, 3 insertions, 4 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)