modified: api/ec_pluginapi.h

	modified:   core/events.cpp
	modified:   core/events.h
	modified:   core/globals.h
	modified:   core/modules.cpp
	modified:   core/modules.h

1 files changed, 18 insertions, 7 deletions

diff --git a/core/events.cpp b/core/events.cpp
index b4a2396..4d206c8 100644
--- a/core/events.cpp
+++ b/core/events.cpp
@@ -16,9 +16,6 @@
 
 #include "commonheaders.h"
 
-extern std::list<evt_handler*> event_handlers;
-extern boost::mutex event_handlers_mutex;
-
 
 const int evt_handler::getType()
 {
@@ -43,7 +40,6 @@ bool RegisterEventHandler(int type, EVENT_HANDLER func)
 {
 	if(!event_handlers.empty())
 	{
-		event_handlers_mutex.lock();
 		std::list<evt_handler*>::iterator end = event_handlers.end();
 		for(std::list<evt_handler*>::iterator i = event_handlers.begin(); i != end; ++i)
 		{
@@ -55,19 +51,34 @@ bool RegisterEventHandler(int type, EVENT_HANDLER func)
 	}
 	return true;
 }
-int RegisterEventType(int type)
+int RegisterEventType(int type, int specialid)
 {
+	plugin *p = NULL;
+	if(!plugins.empty())
+	{
+		std::list<plugin*>::iterator end = plugins.end();
+		for(std::list<plugin*>::iterator i = plugins.begin(); i!= end; ++i)
+		{
+			if((*i)->get_plugin_id() == specialid)
+			{
+				p = *i;
+				break;
+			}
+		}
+		if(!p)
+			return 1;
+	}
 	if(!event_handlers.empty())
 	{
-		event_handlers_mutex.lock();
 		std::list<evt_handler*>::iterator end = event_handlers.end();
 		for(std::list<evt_handler*>::iterator i = event_handlers.begin(); i != end; ++i)
 		{
 			if((*i)->getType() == type)
-				return -1;
+				return 1;
 		}
 	}
 	event_handlers.push_back(new evt_handler(type));
+	p->register_event(type);
 	return 0;
 }