Fixed the crash in setupSpriteDisplay

This happened when an NPC, monster or item couldn't be found and it had
to fall back on Being::Unknown. This instance was bugged since it had a
0 pointer in its sprites list, because when the Being::Unknown was
created, the SpriteDef::Empty was not initialized yet (since both were
global static variables, the initialization order was not well
defined).

Fixed it by removing SpriteDef::Empty and instead creating it in the
BeingInfo constructor. I've also changed the SpriteReference instances
to be inline values rather than instances on the heap, since they're
quite small. That also fixed a leak since those instances were never
getting deleted.

Reviewed-by: Yohann Ferreira

1 files changed, 6 insertions, 6 deletions

diff --git a/src/resources/spritedef.h b/src/resources/spritedef.h
index cef158fa..89d2055f 100644
--- a/src/resources/spritedef.h
+++ b/src/resources/spritedef.h
@@ -35,12 +35,12 @@ class ImageSet;
 
 struct SpriteReference
 {
-    static SpriteReference *Empty;
-
     SpriteReference() {}
 
-    SpriteReference(std::string sprite, int variant)
-    { this->sprite = sprite; this->variant = variant; }
+    SpriteReference(std::string sprite, int variant):
+        sprite(sprite),
+        variant(variant)
+    {}
 
     std::string sprite;
     int variant;
@@ -49,11 +49,11 @@ struct SpriteReference
 struct SpriteDisplay
 {
     std::string image;
-    std::list<SpriteReference*> sprites;
+    std::list<SpriteReference> sprites;
     std::list<std::string> particles;
 };
 
-typedef std::list<SpriteReference*>::const_iterator SpriteRefs;
+typedef std::list<SpriteReference>::const_iterator SpriteRefs;
 
 /*
  * Remember those are the main action.