Use module type to determine what type each module is instead of its location in the configuration file.

1 files changed, 7 insertions, 2 deletions

diff --git a/src/base.cpp b/src/base.cpp
index 537770bcd..82c9ae8b4 100644
--- a/src/base.cpp
+++ b/src/base.cpp
@@ -11,8 +11,6 @@ Base::~Base()
 	{
 		(*it)->Invalidate();
 	}
-
-	FOREACH_MOD(I_OnObjectDestroy, OnObjectDestroy(this));
 }
 
 void Base::AddReference(dynamic_reference_base *r)
@@ -25,3 +23,10 @@ void Base::DelReference(dynamic_reference_base *r)
 	this->References.erase(r);
 }
 
+void Base::operator delete(void *ptr)
+{
+	Base *b = static_cast<Base *>(ptr);
+	FOREACH_MOD(I_OnDeleteObject, OnDeleteObject(b));
+	::operator delete(b);
+}
+