Fix segfault when being count reaches 0 too often

1 files changed, 27 insertions, 29 deletions

diff --git a/src/being.cpp b/src/being.cpp
index ad6b2dea..d94d50d9 100644
--- a/src/being.cpp
+++ b/src/being.cpp
@@ -54,7 +54,6 @@
 #include "utils/stringutils.h"
 #include "utils/xml.h"
 
-int Being::instances = 0;
 int Being::mNumberOfHairstyles = 1;
 std::vector<AnimatedSprite*> Being::emotionSet;
 
@@ -94,29 +93,6 @@ Being::Being(int id, int job, Map *map):
 
     mSpeechBubble = new SpeechBubble();
 
-    if (instances == 0)
-    {
-        // Setup emote sprites
-        for (int i = 0; i <= EmoteDB::getLast(); i++)
-        {
-            EmoteInfo info = EmoteDB::get(i);
-
-            std::string file = "graphics/sprites/" + info.sprites.front()->sprite;
-            int variant = info.sprites.front()->variant;
-            emotionSet.push_back(AnimatedSprite::load(file, variant));
-        }
-
-        // Hairstyles are encoded as negative numbers.  Count how far negative
-        // we can go.
-        int hairstyles = 1;
-        while (ItemDB::get(-hairstyles).getSprite(GENDER_MALE) != "error.xml")
-        {
-            hairstyles++;
-        }
-        mNumberOfHairstyles = hairstyles;
-    }
-
-    instances++;
     mSpeech = "";
     mNameColor = 0x202020;
     mText = 0;
@@ -133,11 +109,6 @@ Being::~Being()
 
     setMap(NULL);
 
-    instances--;
-
-    if (instances == 0)
-        delete_all(emotionSet);
-
     delete mSpeechBubble;
     delete mText;
 }
@@ -608,3 +579,30 @@ void Being::setTargetAnimation(SimpleAnimation* animation)
     mUsedTargetCursor = animation;
     mUsedTargetCursor->reset();
 }
+
+void Being::load()
+{
+    // Setup emote sprites
+    for (int i = 0; i <= EmoteDB::getLast(); i++)
+    {
+        EmoteInfo info = EmoteDB::get(i);
+
+        std::string file = "graphics/sprites/" + info.sprites.front()->sprite;
+        int variant = info.sprites.front()->variant;
+        emotionSet.push_back(AnimatedSprite::load(file, variant));
+    }
+
+    // Hairstyles are encoded as negative numbers.  Count how far negative
+    // we can go.
+    int hairstyles = 1;
+    while (ItemDB::get(-hairstyles).getSprite(GENDER_MALE) != "error.xml")
+    {
+        hairstyles++;
+    }
+    mNumberOfHairstyles = hairstyles;
+}
+
+void Being::cleanup()
+{
+    delete_all(emotionSet);
+}