X-Git-Url: http://git.pk910.de/?p=NeonServV5.git;a=blobdiff_plain;f=src%2FIRCEvents.c;h=56bc57e16e51b06ac89ef9836157cdfb85f78ad5;hp=9e0222bcbb1afaabc915d63045ae40a3d30acd7b;hb=c8e7ce1c57afaebf3996a6712c45f4c89c34ba44;hpb=706e48b1e666054030c491d864f740071e390038 diff --git a/src/IRCEvents.c b/src/IRCEvents.c index 9e0222b..56bc57e 100644 --- a/src/IRCEvents.c +++ b/src/IRCEvents.c @@ -1,4 +1,4 @@ -/* IRCEvents.c - NeonServ v5.3 +/* IRCEvents.c - NeonServ v5.4 * Copyright (C) 2011-2012 Philipp Kreil (pk910) * * This program is free software: you can redistribute it and/or modify @@ -104,7 +104,7 @@ int bind_##NAME(FUNCTYPE *func, int module_id) { \ return 0; \ } \ cbind->func = func; \ - cbind->module_id = module_id \ + cbind->module_id = module_id; \ cbind->next = binds[TYPE]; \ binds[TYPE] = cbind; \ return 1; \ @@ -160,11 +160,7 @@ FUNC_EVENT(nick, nick_func_t, BIND_TYPE_NICK, (struct UserNode *user, char *new_ FUNC_BIND(part, part_func_t, BIND_TYPE_PART) FUNC_UNBIND(part, part_func_t, BIND_TYPE_PART) -FUNC_EVENT(part, part_func_t, BIND_TYPE_PART, (struct ChanUser *chanuser, char *reason), (chanuser, reason)) - -FUNC_BIND(quit, quit_func_t, BIND_TYPE_QUIT) -FUNC_UNBIND(quit, quit_func_t, BIND_TYPE_QUIT) -FUNC_EVENT(quit, quit_func_t, BIND_TYPE_QUIT, (struct UserNode *user, char *reason), (user, reason)) +FUNC_EVENT(part, part_func_t, BIND_TYPE_PART, (struct ChanUser *chanuser, int quit, char *reason), (chanuser, quit, reason)) FUNC_BIND(kick, kick_func_t, BIND_TYPE_KICK) FUNC_UNBIND(kick, kick_func_t, BIND_TYPE_KICK) @@ -216,17 +212,7 @@ FUNC_EVENT(bot_ready, bot_ready_func_t, BIND_TYPE_BOT_READY, (struct ClientSocke FUNC_BIND(registered, registered_func_t, BIND_TYPE_REGISTERED) FUNC_UNBIND(registered, registered_func_t, BIND_TYPE_REGISTERED) -int event_registered(struct UserNode *old_user, struct UserNode *new_user) { - struct binding *cbind; - int ret = 0; - pre_event(BIND_TYPE_REGISTERED); - for(cbind = binds[BIND_TYPE_REGISTERED]; cbind; cbind = cbind->next) { - registered_func_t *func = cbind->func; - ret |= func(old_user, new_user); - } - post_event(BIND_TYPE_REGISTERED); - return ret; -} +FUNC_EVENT(registered, registered_func_t, BIND_TYPE_REGISTERED, (struct UserNode *user, char *new_mask), (user, new_mask)) FUNC_BIND(freeuser, freeuser_func_t, BIND_TYPE_FREEUSER) FUNC_UNBIND(freeuser, freeuser_func_t, BIND_TYPE_FREEUSER)