Replaced event system. Fixed race condition between quest variable recovery and character removal.

1 files changed, 8 insertions, 20 deletions

diff --git a/src/game-server/being.cpp b/src/game-server/being.cpp
index bc690231..7c09d97e 100644
--- a/src/game-server/being.cpp
+++ b/src/game-server/being.cpp
@@ -26,7 +26,7 @@
 
 #include "defines.h"
 #include "game-server/collisiondetection.hpp"
-#include "game-server/deathlistener.hpp"
+#include "game-server/eventlistener.hpp"
 #include "game-server/mapcomposite.hpp"
 #include "utils/logger.h"
 
@@ -43,18 +43,6 @@ Being::Being(int type, int id):
     }
 }
 
-Being::~Being()
-{
-    // Notify death listeners
-    DeathListeners::iterator i_end = mDeathListeners.end();
-    DeathListeners::iterator i;
-    for (i = mDeathListeners.begin(); i != i_end; ++i)
-    {
-        (*i)->deleted(this);
-    }
-
-}
-
 int Being::damage(Object *, Damage const &damage)
 {
     if (mAction == DEAD) return 0;
@@ -122,13 +110,13 @@ int Being::damage(Object *, Damage const &damage)
     {
         HP.mod -= HPloss;
         modifiedAttribute(BASE_ATTR_HP);
-        if (HP.base + HP.mod == 0) die();
+        if (HP.base + HP.mod == 0) died();
     }
 
     return HPloss;
 }
 
-void Being::die()
+void Being::died()
 {
     if (mAction == DEAD) return;
 
@@ -137,12 +125,12 @@ void Being::die()
     // dead beings stay where they are
     clearDestination();
 
-    // Notify death listeners
-    DeathListeners::iterator i_end = mDeathListeners.end();
-    DeathListeners::iterator i;
-    for (i = mDeathListeners.begin(); i != i_end; ++i)
+    for (Listeners::iterator i = mListeners.begin(),
+         i_end = mListeners.end(); i != i_end;)
     {
-        (*i)->died(this);
+        EventListener const &l = **i;
+        ++i; // In case the listener removes itself from the list on the fly.
+        if (l.dispatch->died) l.dispatch->died(&l, this);
     }
 }